Merged fix from upstream/develop
Added i18n plugin