Merge branch '5748-max-buffers' refs #5748
authorTom Clegg <tom@curoverse.com>
Fri, 8 May 2015 18:09:03 +0000 (14:09 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 8 May 2015 18:09:03 +0000 (14:09 -0400)

Trivial merge