From: Nikita Popov <nikic@php.net>
Date: Tue, 10 Jan 2017 22:29:16 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.2RC1~93^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=908ad3cc80136a0804138d112f601141a02e0c7c;p=php

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

908ad3cc80136a0804138d112f601141a02e0c7c