Merge branch 'hotfix-1.2.1'
Corrected bug introduced by 1.2.1
Bumped version number to 1.2.2
Merge branch 'hotfix-1.2.2' into develop