Thread: merge fix for msvc 8/9 regression.