Merge branch 'master' into develop
make compatible with redis-sentinel
Merge branch 'develop'