Fixed typos
Merge branch 'memcache' into dev