Merge branch 'dl/complete-submodule-absorbgitdirs'