Merge "Language detection fixes."