Merge branch '5748-max-buffers-leak-TC' refs #5748
authorTom Clegg <tom@curoverse.com>
Fri, 15 May 2015 02:11:49 +0000 (22:11 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 15 May 2015 02:11:49 +0000 (22:11 -0400)

Trivial merge