Merge branch 'release/1.0.2' into develop

Conflicts:
	pom.xml