From: Nikita Popov <nikic@php.net>
Date: Tue, 27 Dec 2016 20:52:33 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~53
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=937115f8c55ce033d5577c80663daaee5c03855a;p=php

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

937115f8c55ce033d5577c80663daaee5c03855a