Merge branch 'master' into 1776-setup-user-email
authorradhika chippada <radhika@curoverse.com>
Tue, 15 Apr 2014 01:51:04 +0000 (21:51 -0400)
committerradhika chippada <radhika@curoverse.com>
Tue, 15 Apr 2014 01:51:04 +0000 (21:51 -0400)

Trivial merge