#2254 proper fix
Merge remote-tracking branch 'origin/master' into socket.io1.x