Bumped version number to 1.2
small fix
Merge branch 'release-1.2' into develop