Merge branch 'jk/format-patch-empty-prefix'