Merge branch 'release/2.1.0' into develop
Trimmed description and add version to documentation.
Bumped version to 2.1.1.
Merge branch 'release/2.1.1'