Bumped version to 1.2.1
Merge branch 'release/1.2.1'
Merge tag '1.2.1' into develop

Fix from @kcjpop