Merging from trunk

svn path=; revision=84745