From: Joe Watkins <krakjoe@php.net>
Date: Thu, 20 Oct 2016 04:19:10 +0000 (+0100)
Subject: Merge branch 'pull-request/2152' into PHP-7.0
X-Git-Tag: php-7.0.13RC1~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=295377630a7a929fd09e68b3500abce627c94cde;p=php

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

295377630a7a929fd09e68b3500abce627c94cde