Bumped version
Merge branch 'release-0.3.11' into develop