Merging some upstream changes.