Merge branch 'mk/submodule-gitdir-path' into maint