Merge branch 'master' into mjob-password-strength

Conflicts:
	settings/personal.php