Merge branch '9542-websocket-queries'
authorTom Clegg <tom@curoverse.com>
Wed, 6 Jul 2016 16:05:11 +0000 (12:05 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 6 Jul 2016 16:05:11 +0000 (12:05 -0400)
refs #9542


Trivial merge