Merge branch 'master' into target-4.4.3

Conflicts:
	pom.xml