Merge upstream commits.