Merge remote-tracking branch 'origin/4.5.0' into waterml

Conflicts:
	pom.xml