From: Anatol Belski <ab@php.net>
Date: Tue, 20 Oct 2015 18:07:36 +0000 (+0200)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~921
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f13120e737a89a16b502cb6280b380948bfc9ba9;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  backport 262160e and 2d55e8c into 5.6
---

f13120e737a89a16b502cb6280b380948bfc9ba9