Merge branch 'release/release-0.9' into develop
Merge branch 'develop' of https://github.com/gmarcus/test-gitflow