Merge branch '1881-normalize-collection-uuids'
authorTom Clegg <tom@curoverse.com>
Tue, 21 Jan 2014 22:07:39 +0000 (14:07 -0800)
committerTom Clegg <tom@curoverse.com>
Tue, 21 Jan 2014 22:07:39 +0000 (14:07 -0800)
closes #1881


Trivial merge