platform-795 Upgraded to Visual Studio 2012.
Merge branch 'vs2012-upgrade'