Merged upstream.

Done.