Merge "Add workaround for HHVM issue 6206"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 19 May 2017 19:33:48 +0000 (19:33 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 19 May 2017 19:33:48 +0000 (19:33 +0000)

Trivial merge