Bumped version, updated changelog.
Merge branch 'release/2.1.1' into develop