Merge in upstream changes.

Merges in stuff from upstream.