Merged recent changes from trunk.

[SVN r85088]