Merge branch '6846-workbench-top-nav-login-returns-wip'
authorBrett Smith <brett@curoverse.com>
Thu, 12 Nov 2015 21:12:28 +0000 (16:12 -0500)
committerBrett Smith <brett@curoverse.com>
Thu, 12 Nov 2015 21:12:28 +0000 (16:12 -0500)
Closes #6846, #7739.


Trivial merge