Merge branch 'lt/maint-gitdir-relative'