Merge branch 'master' into 4025-move-project-button-label
authorradhika <radhika@curoverse.com>
Fri, 3 Oct 2014 00:08:54 +0000 (20:08 -0400)
committerradhika <radhika@curoverse.com>
Fri, 3 Oct 2014 00:08:54 +0000 (20:08 -0400)

Trivial merge