From: Sara Golemon <pollita@php.net>
Date: Mon, 6 Nov 2017 22:41:09 +0000 (-0500)
Subject: Merge branch 'PHP-7.2'
X-Git-Tag: php-7.3.0alpha1~1078
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e36244e7763f4671f7cc36bb23f37db825d2ce67;p=php

Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixes #68948 related to a BC break introduced by #68532 fix.
---

e36244e7763f4671f7cc36bb23f37db825d2ce67