Merge "Add support for VC++2013"