Websocket is now on the API
Merge remote-tracking branch 'upstream/master'