Merge upstream branch.