Merging upstream revisions.