Bumped version for release of 2.1.1
Merge branch 'release/2.1.1' into develop
Bumped version for development after release.