Merge branch 'master' into ad/memcached