Some upstream changes needed merging.