Merge "Don't use Config as an access method for global objects"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 4 Oct 2016 17:12:50 +0000 (17:12 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 4 Oct 2016 17:12:50 +0000 (17:12 +0000)

Trivial merge