From: Ferenc Kovacs <tyra3l@gmail.com>
Date: Wed, 3 Aug 2016 23:43:27 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0beta3~114
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d4f5e3938a0d9d5abdeb6bb3686f7c34065d6cd;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

7d4f5e3938a0d9d5abdeb6bb3686f7c34065d6cd