Merge tag '1.2.1' into develop

Version 1.2.1
s
Bumped version numbers to match repo
Merge branch 'release/1.2.2'