Merge pull request #16 from cnnic/master

merge from cnnic
redis refactor
Merge branch '14.1.5'
Merge pull request #156 from forumbyr/master

merge from cnnic