From: Nikita Popov <nikic@php.net>
Date: Mon, 5 Sep 2016 12:23:54 +0000 (+0200)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~1334
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8b47ed49c2a3e5e04d5fb7ca95d72b1a0d0275c;p=php

Merge branch 'PHP-7.1'

[ci skip]
---

b8b47ed49c2a3e5e04d5fb7ca95d72b1a0d0275c