Fixed win32 broken by recent changes.
Merge pull request #554 from oliverschmidt/master

Fixed win32 broken by recent changes.
Merge remote-tracking branch 'upstream/master'