Merge "Cleanup after Iba0138a6"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 3 Jan 2017 21:00:45 +0000 (21:00 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 3 Jan 2017 21:00:45 +0000 (21:00 +0000)

Trivial merge