From: Joe Watkins <krakjoe@php.net>
Date: Wed, 4 Jan 2017 14:36:51 +0000 (+0000)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~650
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a3c2abd5301b5f45e7e36631ecbad7ad97a2196c;p=php

Merge branch 'PHP-7.1'

* PHP-7.1:
  fix test
---

a3c2abd5301b5f45e7e36631ecbad7ad97a2196c