Merge branch 'nd/builtin-to-libgit' into next