Merge branch 'master' into 2659-anonymous-server-side
authorradhika <radhika@curoverse.com>
Fri, 27 Jun 2014 14:14:15 +0000 (10:14 -0400)
committerradhika <radhika@curoverse.com>
Fri, 27 Jun 2014 14:14:15 +0000 (10:14 -0400)

Trivial merge