Merge branch 'jk/cache-tree-protect-from-broken-libgit2'