Merge branch '3021-test-perf' refs #3021
authorTom Clegg <tom@curoverse.com>
Tue, 13 Jan 2015 22:10:18 +0000 (17:10 -0500)
committerTom Clegg <tom@curoverse.com>
Tue, 13 Jan 2015 22:10:18 +0000 (17:10 -0500)

Trivial merge