Merge "Better error message for invalid user name in cleanupSpam.php"