Merge remote-tracking branch 'upstream/master'
Conflicts:
	dashboard/index.php
Merge branch 'master' into PasswordReset