Bumped version to 2.1.0.
Merge branch 'release/2.1.0' into develop