Update parent version
Merge branch 'master' into hnx

Conflicts:
	pom.xml