Bumped version and updated changelog.
Merge branch 'release/2.2.1' into develop