From: Joe Watkins <krakjoe@php.net>
Date: Mon, 10 Oct 2016 11:17:11 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' of https://github.com/php/php-src into PHP-7.1
X-Git-Tag: php-7.2.0alpha1~1175^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fb92482c8ad1e35b82c4d7b758ae0f1f5ecd4929;p=php

Merge branch 'PHP-7.1' of https://github.com/php/php-src into PHP-7.1
---

fb92482c8ad1e35b82c4d7b758ae0f1f5ecd4929