Merge branch 'jl/submodule-ignore-diff'