Merge pull request #6453 from colemanw/i18n