Merge branch '3400-workbench-all-items' closes #3400
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 12 Nov 2014 18:42:13 +0000 (13:42 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 12 Nov 2014 18:42:13 +0000 (13:42 -0500)

Trivial merge