Merge branch 'jl/maint-diff-ignore-submodules'