From: Nikita Popov <nikic@php.net>
Date: Mon, 5 Sep 2016 12:22:45 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0alpha1~1334^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a463da7204e1d740707cb0d21ba9475ea30cf7ee;p=php

Merge branch 'PHP-7.0' into PHP-7.1

[ci skip]
---

a463da7204e1d740707cb0d21ba9475ea30cf7ee