Merge branch 'cursey-no-winsock2-header'