Merge branch 'refs/heads/master' into feature-tests

Conflicts:
	pom.xml