Merge pull request #3948 from libgit2/cmn/v24-updates

Backport fixes to v0.24