Merge branch 'master' into 4036-combine-collections-in-project-issue
authorradhika <radhika@curoverse.com>
Fri, 3 Oct 2014 14:05:59 +0000 (10:05 -0400)
committerradhika <radhika@curoverse.com>
Fri, 3 Oct 2014 14:05:59 +0000 (10:05 -0400)

Trivial merge