Bring over various changes from the mainline sources.

From-SVN: r30160
1 file changed