Merge branch 'master' into 5573-user-activity-page-performance
authorRadhika Chippada <radhika@curoverse.com>
Mon, 20 Apr 2015 16:44:52 +0000 (12:44 -0400)
committerRadhika Chippada <radhika@curoverse.com>
Mon, 20 Apr 2015 16:44:52 +0000 (12:44 -0400)

Trivial merge