Merge branch 'master' into 3756-show-user-button
authorRadhika Chippada <radhika@curoverse.com>
Wed, 14 Jan 2015 16:13:49 +0000 (11:13 -0500)
committerRadhika Chippada <radhika@curoverse.com>
Wed, 14 Jan 2015 16:13:49 +0000 (11:13 -0500)

Trivial merge