From: Anatol Belski <ab@php.net>
Date: Thu, 8 Sep 2016 15:49:47 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0RC2~46^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4fda0a94795b62d8923a21f1fd41392d275d3cbf;p=php

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  backport 59444347 and 3d7343f6
---

4fda0a94795b62d8923a21f1fd41392d275d3cbf