Pulled upstream changes.