Merge branch 'release/1.0.5' into develop

Conflicts:
	pom.xml