Merge branch 'dev' (i18n release)