Merge branch 'master' into ilucky-spymemcached