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