From: Anatol Belski <ab@php.net>
Date: Mon, 11 Jan 2016 19:39:52 +0000 (+0100)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.3RC1~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=333765edce97cdde7f78fa3fc90660298f946f08;p=php

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  backport 9a07245b728714de09361ea16b9c6fcf70cb5685 from 7.0
---

333765edce97cdde7f78fa3fc90660298f946f08