Merge remote-tracking branch 'origin/master' into flow

Conflicts:
	pom.xml