From: Nikita Popov <nikic@php.net>
Date: Sat, 1 Oct 2016 17:05:48 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0RC4~100^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=633b93817ea9636366f56898894aa18c4d6e485b;p=php

Merge branch 'PHP-5.6' into PHP-7.0
---

633b93817ea9636366f56898894aa18c4d6e485b