Merge branch 'fg/submodule-git-file-git-dir'