Merge branch 'release/0.9.11' into develop
Merge pull request #2 from 2nova/develop

Merge branch 'release/0.9.11' into develop