new dev
Merge branch 'master' into dev
bug fix in redis pub/sub