Merge branch '6087-collection-timing' closes #6087
authorTom Clegg <tom@curoverse.com>
Thu, 4 Jun 2015 13:37:59 +0000 (09:37 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 4 Jun 2015 13:37:59 +0000 (09:37 -0400)

Trivial merge