Merge "memcached: better error messaging"