From: Anatol Belski <ab@php.net>
Date: Sun, 4 Dec 2016 16:29:22 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~149
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2198ce2f281f17a3ecb4d5272c28d77623213254;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix test
---

2198ce2f281f17a3ecb4d5272c28d77623213254