Small misc changes
Merge branch 'master' into small-things

Conflicts:
	Modules/Members/Main/mindex.php