Merge branch 'nd/maint-i18n-diffstat'