Merge "Follow up to I42e74ed3bcd0bfa9ec0c344ba67668210450c975"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 5 Jan 2017 18:50:05 +0000 (18:50 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 5 Jan 2017 18:50:05 +0000 (18:50 +0000)

Trivial merge