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