Terminate the WebSocket server thread cleanly. Use poll() instead of run().
Merge remote-tracking branch 'rex/tundra2' into admino_tundra