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