Merge branch 'release/0.11' into develop
Merge branch 'develop'
still fixing bad merge