From: Sara Golemon <pollita@php.net>
Date: Thu, 27 Jul 2017 14:04:59 +0000 (-0400)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.0beta2~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a6ef8327a5b2e0bc51f833df200b7508030eede;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Simpler fix for #74974
---

4a6ef8327a5b2e0bc51f833df200b7508030eede