Merge origin/master

Conflicts:
	src/java/Logger/LogService2.java