Continue merging with upstream master.