Merged recent changes from trunk.

[SVN r85092]
Merged recent changes from trunk.

[SVN r85604]
Merged changeset 85793 from trunk.

[SVN r85969]