Merge pull request #2468 from octo/ff/memcached