Merge branch 'ad/memcached'