Bumped version number to 1.2.1
did the hotfix
Merge branch 'hotfix-1.2.1'