Update for 4.6.0.BUILD-SNAPSHOT development
Merge branch '4.x'

Conflicts:
	pom.xml