Fixes issue commented on in #377#501

rauchg merged 3 commits intosocketio:mastersocketio/socket.io:masterfrom

einaros:mastereinaros/socket.io:masterCopy head branch name to clipboard