Merged squashed trunk master.

svn path=/sandbox/; revision=84141