Merge upstream changes.