Merge branch 'master' into 6057-public-projects-page
authorradhika <radhika@curoverse.com>
Fri, 22 May 2015 20:40:59 +0000 (16:40 -0400)
committerradhika <radhika@curoverse.com>
Fri, 22 May 2015 20:40:59 +0000 (16:40 -0400)

Trivial merge