bringing in changes from upstream

I think this is what I do to sync my fork?