Merge branch 'jc/submodule-anchor-git-dir' into maint