reduce warning during build
Merge remote-tracking branch 'origin/1.1-ci' into 1.1-ci-bundle

Conflicts:
	pom.xml