From: Anatol Belski <ab@php.net>
Date: Thu, 24 Apr 2014 17:52:53 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~344^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f43032ea4d648ae3ec7edc9cf304692a73a828d;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  backport this piece from 5.6, related to the #66307 fix
---

8f43032ea4d648ae3ec7edc9cf304692a73a828d