[I18n-commits] [i18n] 06/07: Merge branch 'master' into develop