Better (maybe) error handling in websocket
Merge branch 'master' into builds
7.31