Merge branch 'libgit2-and-better-errorhandling'