Merge branch '4754-performance-TC' closes #4754
authorTom Clegg <tom@curoverse.com>
Tue, 23 Dec 2014 20:51:49 +0000 (15:51 -0500)
committerTom Clegg <tom@curoverse.com>
Tue, 23 Dec 2014 20:51:49 +0000 (15:51 -0500)

Trivial merge