Merge origin/master

Conflicts:
	test/pcconfigurator/ConfigurationManagerImplTest.java