Updated to compile with v110 toolset, i.e. VS2012.