Merge "Fix ORDER BY in fixUserRegistration.php"