Merge branch 'master' into 3193-manage-account
authorradhika <radhika@curoverse.com>
Tue, 29 Jul 2014 17:29:56 +0000 (13:29 -0400)
committerradhika <radhika@curoverse.com>
Tue, 29 Jul 2014 17:29:56 +0000 (13:29 -0400)

Trivial merge