Merge branch '1748-workbench-view-files'
authorTom Clegg <tom@curoverse.com>
Thu, 2 Jan 2014 20:52:13 +0000 (12:52 -0800)
committerTom Clegg <tom@curoverse.com>
Thu, 2 Jan 2014 20:52:13 +0000 (12:52 -0800)
closes #1748


Trivial merge