Merge branch 'hotfix/0.3.4'
Merge branch 'release/0.4'
Remove wrong email address.
Merge branch 'hotfix/0.4.1' into develop

Conflicts:
	pom.xml