Merge branch '2857-collection-tests'
authorTim Pierce <twp@curoverse.com>
Fri, 6 Jun 2014 21:37:18 +0000 (17:37 -0400)
committerTim Pierce <twp@curoverse.com>
Fri, 6 Jun 2014 21:37:18 +0000 (17:37 -0400)
Closes #2857.


Trivial merge