Merge in upstream changes.