From: Anatol Belski <ab@php.net>
Date: Thu, 8 Sep 2016 15:51:24 +0000 (+0200)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~1317
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb89f75f07ada135494908b88e856b815332694f;p=php

Merge branch 'PHP-7.1'

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

bb89f75f07ada135494908b88e856b815332694f