Merge "Add new index to make updateCollation.php painless"