Release 1.2
Update version number to v1.2.1, changelog
Release 1.2.1
Merge branch 'master' into develop