Merge branch 'jc/maint-format-patch-encoding' into maint