Merge branch 'jc/linkgit-fix' into maint