redis pubsub bug to fix
Merge branch 'master' into dev