From: Joe Watkins <krakjoe@php.net>
Date: Thu, 5 Jan 2017 16:59:23 +0000 (+0000)
Subject: Merge branch 'master' of git.php.net:/php-src
X-Git-Tag: php-7.2.0alpha1~639
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b36d8d54a8d25462fbccac6a340a9b86d52dd9e;p=php

Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src:
---

9b36d8d54a8d25462fbccac6a340a9b86d52dd9e