From: Nikita Popov <nikic@php.net>
Date: Sat, 7 Jan 2017 23:02:42 +0000 (+0100)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~593
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=72038b6c381aa17c525fcb551b7c53f6a9d7b55e;p=php

Merge branch 'PHP-7.1'
---

72038b6c381aa17c525fcb551b7c53f6a9d7b55e