Merge remote-tracking branch 'remotes/mattn/win32' into win32

Conflicts:
	src/socket.c