Merge "More quick fixes for mw.ForeignUpload"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 7 Oct 2015 20:04:12 +0000 (20:04 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 7 Oct 2015 20:04:12 +0000 (20:04 +0000)

Trivial merge