Update upstream repo and git version