Bump to new upstream