Merge branch 'ph/format-patch-no-color'