Merge "fix unit test failure on win32 vs2008 build"