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