Merge "fix a typo in generateCollationData.php"