Merge branch '1499-workbench-tags'
authorTom Clegg <tom@curoverse.com>
Tue, 14 Jan 2014 01:10:46 +0000 (17:10 -0800)
committerTom Clegg <tom@curoverse.com>
Tue, 14 Jan 2014 01:10:46 +0000 (17:10 -0800)

Trivial merge