(cherry picked from commit a905764e3d)
a905764e3d
(cherry picked from commit 8ddf9fe4b0)
8ddf9fe4b0
_WIN32_WINNT redefinition fix is no longer needed as it was merged upstream. PR 1453 is still not merged, diff updated to current state.