From: Anatol Belski <ab@php.net>
Date: Sat, 23 Jul 2016 19:06:46 +0000 (+0200)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~1558^2~155
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=99bc1407c8a8297c4f37cb07c727a2d15c5412de;p=php

Merge branch 'PHP-7.1'

* PHP-7.1:
  fix test
  fix test
---

99bc1407c8a8297c4f37cb07c727a2d15c5412de