Merge branch 'lt/maint-gitdir-relative' into maint