Merged recent changes from trunk

[SVN r86659]