From: Anatol Belski <ab@php.net>
Date: Sat, 21 Jan 2017 01:57:54 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.2RC1~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3020be675aec907cc9229814b674f712b8fdd739;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  backport 51e1da6ea1e663908302e162ced1b7a8cb5aee05 into 7.0
---

3020be675aec907cc9229814b674f712b8fdd739