Move SQL/Disk caches over to memcached
Merge remote-tracking branch 'origin/master'