release 1.2.0
Merge branch '1.2'

Conflicts:
	CHANGELOG.md