From: Anatol Belski <ab@php.net>
Date: Tue, 21 Jun 2016 14:22:51 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0alpha2~14^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1d5a4520be0c70800c019dd79d6bd71a43edbc33;p=php

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix test
---

1d5a4520be0c70800c019dd79d6bd71a43edbc33