Merge branch 'bc/format-patch-null-from-line'