Merge branch 'master' into 4054-sharing-email
authorradhika <radhika@curoverse.com>
Tue, 21 Oct 2014 16:48:35 +0000 (12:48 -0400)
committerradhika <radhika@curoverse.com>
Tue, 21 Oct 2014 16:48:35 +0000 (12:48 -0400)

Trivial merge