release 0.2.11
Merge branch 'release-0.2.11' into develop