Merge origin/master

Conflicts:
	src/main/java/Bundle.properties
Merge origin/master