Pull stuff from upstream repo