Merge branch '8800-queue-query'
authorBrett Smith <brett@curoverse.com>
Sun, 27 Mar 2016 20:47:07 +0000 (16:47 -0400)
committerBrett Smith <brett@curoverse.com>
Sun, 27 Mar 2016 20:47:07 +0000 (16:47 -0400)
Closes #8800, #8809.


Trivial merge