From: Joe Watkins <krakjoe@php.net>
Date: Sat, 12 Nov 2016 17:57:20 +0000 (+0000)
Subject: Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
X-Git-Tag: php-7.1.0~3^2~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=011afaf9c4f9f1fca70162b8de076e4315286142;p=php

Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
---

011afaf9c4f9f1fca70162b8de076e4315286142