From: Joe Watkins <krakjoe@php.net>
Date: Thu, 20 Oct 2016 04:25:03 +0000 (+0100)
Subject: Merge branch 'pull-request/2152'
X-Git-Tag: php-7.2.0alpha1~1073
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0d768f74b604adb7d6f577c017d9422ff6c7691e;p=php

Merge branch 'pull-request/2152'
---

0d768f74b604adb7d6f577c017d9422ff6c7691e