Merge branch '0.9.x' into 1.0.x

diff --cc actions/shownotice.php
Simple merge

diff --cc actions/showstream.php
Simple merge

diff --cc classes/Profile.php
Simple merge

diff --cc lib/command.php
Simple merge

diff --cc lib/util.php
Simple merge

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