From: Stanislav Malyshev <stas@php.net>
Date: Mon, 16 Jan 2017 02:42:44 +0000 (-0800)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.2RC1~69
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca6f679417308796ae166f9fd2f6cd9a8cf4ccbe;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix test
---

ca6f679417308796ae166f9fd2f6cd9a8cf4ccbe