From: Jakub Zelenka <bukka@php.net>
Date: Sun, 29 Jan 2017 20:44:51 +0000 (+0000)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.2RC1~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1dab39b9aa0934e01d8ad1e91d0db3bbd20a1dbd;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

1dab39b9aa0934e01d8ad1e91d0db3bbd20a1dbd