Update upstream. Websocket support. Fixes #965