Update socket.io integration.
Merge branch 'dev' into websockets