From: Nikita Popov <nikic@php.net>
Date: Fri, 2 Dec 2016 16:03:59 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~156
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=91d365f80524b0b9ad1702736fea7dc67dd64277;p=php

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

91d365f80524b0b9ad1702736fea7dc67dd64277