From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 18 Oct 2017 15:27:21 +0000 (+0300)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-7.3.0alpha1~1247
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b87b3556409504ede9d192c9979c268f2549fbf;p=php

Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Backport 7ff13badda58b966ff8fbcc61add48bb5b14117b into 7.0+
---

8b87b3556409504ede9d192c9979c268f2549fbf