Merge branch '4388-workbench-update' closes #4388
authorTom Clegg <tom@curoverse.com>
Mon, 17 Nov 2014 14:32:44 +0000 (09:32 -0500)
committerTom Clegg <tom@curoverse.com>
Mon, 17 Nov 2014 14:32:44 +0000 (09:32 -0500)

Trivial merge