Merge branch 'master' into move_passwordchange_text

Conflicts:
	settings/js/personal.js