Merge "Avoid implicit globals"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 1 May 2017 21:39:51 +0000 (21:39 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 1 May 2017 21:39:51 +0000 (21:39 +0000)

Trivial merge