Merge "Avoid DatabaseBase type errors in setupDatabaseWithTestPrefix()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 23 Sep 2016 23:41:20 +0000 (23:41 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 23 Sep 2016 23:41:20 +0000 (23:41 +0000)

Trivial merge