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

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix test
---

b6f5fcfc3afbb176fa54469d27b80aa3b568d7f3