From: Joe Watkins <krakjoe@php.net>
Date: Thu, 20 Oct 2016 04:23:21 +0000 (+0100)
Subject: Merge branch 'pull-request/2152' into PHP-7.1
X-Git-Tag: php-7.1.0RC5~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5de20ef3ae46daf4414866c094e2ae72790ef1ff;p=php

Merge branch 'pull-request/2152' into PHP-7.1
---

5de20ef3ae46daf4414866c094e2ae72790ef1ff