From: Anatol Belski <ab@php.net>
Date: Thu, 8 Sep 2016 15:50:46 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0RC2~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1cf0a2c9aeb3737e094d6bc4eb31ef150e86bed1;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  backport 59444347 and 3d7343f6
---

1cf0a2c9aeb3737e094d6bc4eb31ef150e86bed1