Merge branch '2891-workbench-errors-retain-login'
authorBrett Smith <brett@curoverse.com>
Mon, 23 Jun 2014 17:20:46 +0000 (13:20 -0400)
committerBrett Smith <brett@curoverse.com>
Mon, 23 Jun 2014 17:21:15 +0000 (13:21 -0400)
Closes #3032, #3074.  Refs #2891.


Trivial merge