From: sskaje <sskaje@gmail.com>
Date: Tue, 31 May 2016 12:08:13 +0000 (+0800)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: php-7.2.0alpha1~672^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b1e9515d8b5f86c68c918c5ccd382493b65b69c5;p=php

Merge remote-tracking branch 'upstream/master'
---

b1e9515d8b5f86c68c918c5ccd382493b65b69c5