From: Anatol Belski <ab@php.net>
Date: Fri, 3 Jul 2015 09:17:16 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.1.0alpha3~25^2~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=54e19fe7c3588ed93c29a6084336405c21e88aaf;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  backport c01943bffc8b719e552d307f522820d50f783a4c into 5.6
---

54e19fe7c3588ed93c29a6084336405c21e88aaf