From: Nikita Popov <nikic@php.net>
Date: Sun, 23 Oct 2016 20:27:11 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0RC5~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cbde0a6fc2d402e1d035834685d59c23789c199d;p=php

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

cbde0a6fc2d402e1d035834685d59c23789c199d