Merge branch 'sb/format-patch-parseopt'