From: Anatol Belski <ab@php.net>
Date: Tue, 13 Sep 2016 09:51:17 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0RC2~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2088e3eb45ebed1b9eb0f6b3fe258820a0021e5f;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  pick up the safe alloc pieces from 19866fb76cf4c95d904ebb0e08592cf38303fae9
---

2088e3eb45ebed1b9eb0f6b3fe258820a0021e5f