Merge branch 'jl/submodule-diff-dirtiness' into next