Merge branch 'jk/rebase-i-exec-gitdir-fix' into maint