commit
Merge remote-tracking branch 'origin/master' into 1.2.x

Conflicts:
	pom.xml