Merge branches 'update-libgit2' and 'objective_cpp' into gitx