Merge remote-tracking branch 'origin/master' into osgi-module

Conflicts:
	pom.xml