Merge pull request #6451 from colemanw/i18n