Merge from trunk, thus enabling support for VC++ 2013.

[SVN r86432]