closes #2444
closes #2443, closes #2445
Merge remote-tracking branch 'origin/master' into socket.io1.x