VS2010 support commit.
Updates for VS2013.