Latest master to MSVC++