Philipp Schafft (2c950d5f) at 13 Mar 15:47
Merge branch 'update-winsock-fixes'
... and 2 more commits