Merge "Fix phpdoc since $proto can be int"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 18 Jan 2018 21:30:29 +0000 (21:30 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 18 Jan 2018 21:30:29 +0000 (21:30 +0000)

Trivial merge