Merge branch 'master' into testing

Conflicts:
	lib/stompqueuemanager.php

diff --cc classes/Memcached_DataObject.php
Simple merge

diff --cc lib/cache.php
Simple merge

diff --cc lib/default.php
Simple merge

diff --cc lib/statusnet.php
Simple merge

diff --cc plugins/MemcachePlugin.php
Simple merge