From: Joe Watkins <krakjoe@php.net>
Date: Fri, 6 Jan 2017 05:33:49 +0000 (+0000)
Subject: Merge branch 'master' of git.php.net:/php-src
X-Git-Tag: php-7.2.0alpha1~627
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a972143dd6360f61bef962e1badf1289b80476bb;p=php

Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src:
  add skip when json not loaded
---

a972143dd6360f61bef962e1badf1289b80476bb