From: Anatol Belski <ab@php.net>
Date: Sat, 23 Jul 2016 19:04:52 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0beta2~86^2~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b238211732cc66522e7757453146f3d48005bf54;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix test
---

b238211732cc66522e7757453146f3d48005bf54