Merged changes from trunk. Fixes operator<< handling of width specification.

svn path=; revision=84674