Merge branch 'upstream' into binary
Merge branch 'binary' of https://github.com/brishin/socket.io into binary
Merge branch 'binary' of https://github.com/brishin/socket.io into binary