Avoid "variable may be used uninitialized" warning from Visual C.
Catch-up merge from master sources to mps/branch/2013-05-17/emergency.
Build and run on Windows.