Poof! Merge upstream changes.