Version 1.2.0 release
Increment versions for next release
Merge branch 'master' into v2.0.0_staging

Conflicts:
	build.gradle
	build.upload
	pom.xml