From: Nikita Popov <nikic@php.net>
Date: Sat, 16 Jul 2016 21:02:34 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0beta1~54^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31cbe23a9a4a47b922cd1f6db1a393c5dbdaad36;p=php

Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
	Zend/zend_gc.c
---

31cbe23a9a4a47b922cd1f6db1a393c5dbdaad36