Merge branch 'hotfix/0.9.1-h1' into develop
Merge pull request #1 from brtz/develop

Merge branch 'hotfix/0.9.1-h1' into develop