Merge branch 'master' into feature/relooking

Conflicts:
	pom.xml