Merge branch '1904-workbench-reader-tokens'
authorBrett Smith <brett@curoverse.com>
Mon, 5 May 2014 19:20:45 +0000 (15:20 -0400)
committerBrett Smith <brett@curoverse.com>
Mon, 5 May 2014 19:21:29 +0000 (15:21 -0400)
Refs #1904.  Closes #2663, #2736.


Trivial merge