4266: Merge branch 'master' into 4266-log-performance
authorTom Clegg <tom@curoverse.com>
Tue, 21 Oct 2014 21:12:07 +0000 (17:12 -0400)
committerTom Clegg <tom@curoverse.com>
Tue, 21 Oct 2014 21:12:07 +0000 (17:12 -0400)

Trivial merge