Merge branch 'master' into 3836-remove-collection-from-project-bug
authorradhika <radhika@curoverse.com>
Fri, 26 Sep 2014 19:32:52 +0000 (15:32 -0400)
committerradhika <radhika@curoverse.com>
Fri, 26 Sep 2014 19:32:52 +0000 (15:32 -0400)

Trivial merge