Merge branch 'test'

Conflicts:
	dependency-reduced-pom.xml
	pom.xml
Whoops