test
Merge remote-tracking branch 'origin/thomas' into thomas

Conflicts:
	layers/logging.ini