Merge branch '2755-api-collection-permissions'
authorTim Pierce <twp@curoverse.com>
Wed, 21 May 2014 18:15:01 +0000 (14:15 -0400)
committerTim Pierce <twp@curoverse.com>
Wed, 21 May 2014 19:54:56 +0000 (15:54 -0400)
closes #2784, closes #2787


Trivial merge