From: Christopher Jones <sixd@php.net>
Date: Thu, 18 Aug 2016 05:47:36 +0000 (+1000)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0beta3~17^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=127b42f9b3aa1f4e956f2e17f9fc6b547202d804;p=php

Merge branch 'PHP-5.6' into PHP-7.0
---

127b42f9b3aa1f4e956f2e17f9fc6b547202d804