Bump version to 2.1.1
Update changelog
Merge branch 'release-2.1.1' into develop