Make results of websocket client come back as a stream instead of just a single result.
Merge remote-tracking branch 'origin/master'