Merge branch 'master' into 6057-public-projects-page
authorradhika <radhika@curoverse.com>
Tue, 26 May 2015 22:58:18 +0000 (18:58 -0400)
committerradhika <radhika@curoverse.com>
Tue, 26 May 2015 22:58:18 +0000 (18:58 -0400)

Trivial merge