From: Joe Watkins <krakjoe@php.net>
Date: Mon, 10 Oct 2016 11:14:26 +0000 (+0100)
Subject: Merge branch 'pull-request/2082'
X-Git-Tag: php-7.2.0alpha1~1177
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b0cacee3031b9f8ae983db3a690707b0ed68f7f8;p=php

Merge branch 'pull-request/2082'
---

b0cacee3031b9f8ae983db3a690707b0ed68f7f8