Merge "Follow-up to Ie3499d"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 27 Oct 2015 09:47:21 +0000 (09:47 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 27 Oct 2015 09:47:21 +0000 (09:47 +0000)

Trivial merge