Merge iostreams to release.

Remove some tabs, and fix a test on C++11 compilers.

svn path=; revision=84624