Merge branch 'hotfix/fix-generator' into develop
Merge branch 'master' into develop
Merge branch 'hotfix/codeclimate' into develop
Merge branch 'release/v0.11.7'
bump
Merge branch 'release/v0.11.7'