Merge branch 'jl/diff-submodule-ignore'