From: Derick Rethans <github@derickrethans.nl>
Date: Fri, 7 Oct 2016 17:49:08 +0000 (-0400)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~1191
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aed25395e5061d8c9da07b25ca4a47f2263e9dcf;p=php

Merge branch 'PHP-7.1'
---

aed25395e5061d8c9da07b25ca4a47f2263e9dcf