Merge branch 'upgrade-libgit2'