Merge branch 'hotfix/1.1'
bump version
Merge branch 'release/2.0'
Merge branch 'release/2.0' into develop
bump version
whoops, this variable was shadowing the redis import
Merge branch 'hotfix/2.1' into develop