Merge remote-tracking branch 'remotes/parent/master'

Conflicts:
	extras/pom.xml
	pom.xml