From: Derick Rethans <github@derickrethans.nl>
Date: Fri, 29 Jan 2016 14:34:47 +0000 (+0100)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.2.0alpha1~620^2~48^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eae59145544d0436d99252596014eedfa7c74d9e;p=php

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

eae59145544d0436d99252596014eedfa7c74d9e