Updated version code for 1.2.0 release
Merge branch 'release/v1.2.0' into develop