Merge branch '6074-collections-index' closes #6074
authorTom Clegg <tom@curoverse.com>
Thu, 4 Jun 2015 19:29:35 +0000 (15:29 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 4 Jun 2015 19:29:35 +0000 (15:29 -0400)

Trivial merge