From: Remi Collet <remi@php.net>
Date: Fri, 6 Jan 2017 05:27:25 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.2RC1~159^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d18d3e7825163e454555edab229688ba17e28ff8;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  add skip when json not loaded
---

d18d3e7825163e454555edab229688ba17e28ff8