Merge branch 'mg/status-porcelain-no-i18n' into maint