From: Derick Rethans <github@derickrethans.nl>
Date: Wed, 15 Jun 2016 17:30:03 +0000 (+0100)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0alpha2~23^2~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=76ec139a0a03f9584968b3059e8b2ea11e54afc1;p=php

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

76ec139a0a03f9584968b3059e8b2ea11e54afc1