From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 16 Mar 2017 16:40:33 +0000 (+0100)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~254
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=69dc088c36fcbf9da4a96c3f9791dd1f36e9e82f;p=php

Merge branch 'PHP-7.1'
---

69dc088c36fcbf9da4a96c3f9791dd1f36e9e82f