Merge "Remove check for MW_NO_SETUP"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 13 Jan 2017 01:29:16 +0000 (01:29 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 13 Jan 2017 01:29:17 +0000 (01:29 +0000)

Trivial merge