Merge branch 'release/0.2.11'
Merge branch 'master' into develop