Merge branch 'spinscale-master'

Conflicts:
	pom.xml