Merge branch 'ticket/10729' into ticket/10729-2

Conflicts:
	phpBB/includes/functions_user.php