Merge branch 'master' into 3296-user-profile
authorradhika <radhika@curoverse.com>
Tue, 5 Aug 2014 14:10:14 +0000 (10:10 -0400)
committerradhika <radhika@curoverse.com>
Tue, 5 Aug 2014 14:10:14 +0000 (10:10 -0400)

Trivial merge