Merge branch 'master' into 3193-manage-account
authorradhika <radhika@curoverse.com>
Wed, 23 Jul 2014 21:20:08 +0000 (17:20 -0400)
committerradhika <radhika@curoverse.com>
Wed, 23 Jul 2014 21:20:08 +0000 (17:20 -0400)

Trivial merge