Bumped version number to 2.1.0.
Merge branch 'release-2.1.0' into development
Change minor version to development version.