Merge branch 'nd/git-dir-pointing-at-gitfile' into maint