Merge "Update data for emoji modifier bases to Unicode 9" into nyc-dev