From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 2 Jun 2017 21:36:44 +0000 (+0200)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2a2e49063c377524fc58fb515552f5827c2dfad;p=php

Merge branch 'PHP-7.1'
---

e2a2e49063c377524fc58fb515552f5827c2dfad