Merge pull request #2444 from cshoredaniel/pr-cshored-i18n