Version bump (1.1.2)
Merge branch 'maint/4.0/testing'

Conflicts:
	VERSION
Version bump (1.2.0)