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