Merge branch 'release/0.4.8' into develop
Upgrade eredis
Merge branch 'develop'