Merge pull request #4223 from castillofrancodamian/i18n