Integrate upstream changes.