Merge branch '8189-handle-large-collections-better' refs #8189
authorTom Clegg <tom@curoverse.com>
Thu, 14 Jan 2016 20:19:48 +0000 (15:19 -0500)
committerTom Clegg <tom@curoverse.com>
Thu, 14 Jan 2016 20:19:48 +0000 (15:19 -0500)

Trivial merge