Merge branch 'master' into 1776-setup-user-email
authorradhika chippada <radhika@curoverse.com>
Wed, 9 Apr 2014 21:03:54 +0000 (17:03 -0400)
committerradhika chippada <radhika@curoverse.com>
Wed, 9 Apr 2014 21:03:54 +0000 (17:03 -0400)

Trivial merge