Merge branch 'release-1.2'
Bumped version number to 1.2.1
Fixed severe production problem
Merge branch 'hotfix-1.2.1' into develop