Updated version and changelog.
Merge branch 'release/1.2'
Merge tag '1.2' into develop

3.6 compatibility upgrades and minor feature updates