Merge in some upstream changes.