Merge branch 'nd/fixup-linked-gitdir' into maint