Merge branch 'dg/submodule-in-dismembered-working-tree'