Merge branch 'bk/fix-relative-gitdir-file'