Merge branch 'master' into 3836-remove-collection-from-project-bug
authorradhika <radhika@curoverse.com>
Thu, 25 Sep 2014 18:35:55 +0000 (14:35 -0400)
committerradhika <radhika@curoverse.com>
Thu, 25 Sep 2014 18:35:55 +0000 (14:35 -0400)

Trivial merge