Merge branch '0.9.x' into 1.0.x

diff --cc README
Simple merge

diff --cc classes/Notice.php
Simple merge

diff --cc classes/Profile.php
Simple merge

diff --cc lib/default.php
Simple merge

diff --cc lib/queuemanager.php
Simple merge

diff --cc lib/router.php
Simple merge

diff --cc plugins/OStatus/classes/Ostatus_profile.php
Simple merge