Not needed anymore
Merge branch 'master' into rediswrapper