Merge branch 'hotfix/0.3.1'
SIC - Why is it so much easier to spot them after a push eh?
Merge branch 'hotfix/0.3.2' into develop

Conflicts:
	pom.xml