Merge branch 'master' into working

Conflicts that were resolved by hand:
	conf/ext/thebrig/extensions_thebrig_edit.php
	conf/ext/thebrig/functions.inc