Merge "Make Language::hasVariant() more strict"