From: Anatol Belski <ab@php.net>
Date: Tue, 12 Jan 2016 06:09:32 +0000 (+0100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~617^2~76
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d880131736f5904a988543a0e1108cd1dfebbd96;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  re-apply patch for github PR #1695
---

d880131736f5904a988543a0e1108cd1dfebbd96