v11.4, minor bugs fixed
Merge branch 'master' into docu/11_4/1

Conflicts:
	chm_files/docs/settings.html