- merged overlapping parts of locale_fixes patch into morelocales patch