Merge branch 'fl/memcached'