Merged timbyr's win32 branch. -r 547:566.