From: Nuno Lopes <nlopess@php.net>
Date: Wed, 30 Nov 2016 19:41:26 +0000 (-0500)
Subject: Merge branch 'PHP-7.0' of https://git.php.net/push/php-src into PHP-7.0
X-Git-Tag: php-7.0.15RC1~18^2~87
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d5a2af6d1ce81b4124b690fe86e2e2be0545ae12;p=php

Merge branch 'PHP-7.0' of https://git.php.net/push/php-src into PHP-7.0
---

d5a2af6d1ce81b4124b690fe86e2e2be0545ae12