Merge branch 'jt/format-patch-base-info-above-sig'