Merge "Force User::__toString() return value to be string"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 19 Oct 2016 00:01:12 +0000 (00:01 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 19 Oct 2016 00:01:12 +0000 (00:01 +0000)

Trivial merge