From: Anatol Belski <ab@php.net>
Date: Sat, 21 Jan 2017 01:59:07 +0000 (+0100)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~492
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ccf1cf5626bceedb6a40373a8d00f281eb3ae45;p=php

Merge branch 'PHP-7.1'

* PHP-7.1:
  backport 51e1da6ea1e663908302e162ced1b7a8cb5aee05 into 7.0
---

0ccf1cf5626bceedb6a40373a8d00f281eb3ae45