Merge "Keep locale info in Hyphenator."