Merge branch 'sb/submodule-embed-gitdir'