3021: Merge branch 'master' into 3021-workbench-perf
authorTom Clegg <tom@curoverse.com>
Thu, 15 Jan 2015 21:29:59 +0000 (16:29 -0500)
committerTom Clegg <tom@curoverse.com>
Thu, 15 Jan 2015 21:29:59 +0000 (16:29 -0500)

Trivial merge