From: Nikita Popov <nikic@php.net>
Date: Tue, 30 Aug 2016 11:45:49 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0RC1~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c361020f04548d4b0c3dd162828836a283fed68e;p=php

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

c361020f04548d4b0c3dd162828836a283fed68e