I'm just doing this manually this once because some commits were squashed, and I want to be sure they merge cleanly for the nightly automatic merge. "git merge upstream/master"
