Merge branch 'dk/format-patch-ignore-diff-submodule' into maint