Merge "upload: Avoid &$this in hooks"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 20 Dec 2016 23:36:15 +0000 (23:36 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 20 Dec 2016 23:36:16 +0000 (23:36 +0000)

Trivial merge