Merge branch 'jc/maint-format-patch-o-relative' into maint