Merge branch '11544-bad-collection-id-500'
authorTom Clegg <tom@curoverse.com>
Tue, 25 Apr 2017 17:22:44 +0000 (13:22 -0400)
committerTom Clegg <tom@curoverse.com>
Tue, 25 Apr 2017 17:22:44 +0000 (13:22 -0400)
closes #11544


Trivial merge