Merge branch 'master-upstream'

Conflicts:
	.gitignore
	pom.xml