From: Nikita Popov <nikic@php.net>
Date: Mon, 5 Sep 2016 12:22:29 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0RC2~56^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1cd0c80acf581cd9e79fbb3ffc2811bb7a783c5b;p=php

Merge branch 'PHP-5.6' into PHP-7.0

[ci skip]
---

1cd0c80acf581cd9e79fbb3ffc2811bb7a783c5b