From: Nikita Popov <nikita.ppv@gmail.com>
Date: Sun, 9 Apr 2017 13:57:15 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.5RC1~63
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6db59ee0e02dcd114399eefad6abcb944c5fd55a;p=php

Merge branch 'PHP-7.0' into PHP-7.1

[skip ci]
---

6db59ee0e02dcd114399eefad6abcb944c5fd55a