Merge "Various fixes for phan-taint-check"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 4 Mar 2019 03:24:47 +0000 (03:24 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 4 Mar 2019 03:24:47 +0000 (03:24 +0000)

Trivial merge