synced amalgamation
Fixed win32 unit test build
Squashed win32 warning