From: Nikita Popov <nikic@php.net>
Date: Sat, 30 Jul 2016 16:24:59 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0beta2~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=510aba6276f497d0095e16b96ce51b3005024c1e;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

510aba6276f497d0095e16b96ce51b3005024c1e