Merge "Fix regression in I24d9b16"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 9 Nov 2015 15:04:54 +0000 (15:04 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 9 Nov 2015 15:04:54 +0000 (15:04 +0000)

Trivial merge