Merge pull request #1795 from mlutfy/master-crm13584-instali18n