Merge branch '8285-fuse-subscribe-websockets' closes #8285
authorTom Clegg <tom@curoverse.com>
Sat, 6 Feb 2016 00:45:30 +0000 (19:45 -0500)
committerTom Clegg <tom@curoverse.com>
Sat, 6 Feb 2016 00:45:30 +0000 (19:45 -0500)

Trivial merge