Don't attempt to shutdown websocket, it tries to write socket
Merge branch 'master' into builds
7.243