0.11.0
Merge branch 'release-0.11.0' into develop