From: Remi Collet <remi@php.net>
Date: Fri, 6 Jan 2017 05:27:39 +0000 (+0100)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~627^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=731a507b9d48a9b5cec7bee0a3dacdfc7cd2d67e;p=php

Merge branch 'PHP-7.1'

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

731a507b9d48a9b5cec7bee0a3dacdfc7cd2d67e