Fix #98. Thanks to @robertgtaylor1 for the find.
Merge branch 'upstream/master' into websocket