Merge origin/master

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