closed #2459
closes #2457
Merge remote-tracking branch 'origin/master' into socket.io1.x