Merge branch 'sb/format-patch-parseopt' into sb/opt-filename