Merge branch 'master' into testing

Conflicts:
	etc/test_initialise.pl
	root/curs/breadcrumbs.mhtml