Merge branch 'libgit2'