From: Joe Watkins <krakjoe@php.net>
Date: Fri, 6 Jan 2017 05:32:55 +0000 (+0000)
Subject: Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
X-Git-Tag: php-7.1.2RC1~158^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=12bbeaa45e3f2c4f3896b7e53f189e2fca5380df;p=php

Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0

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

12bbeaa45e3f2c4f3896b7e53f189e2fca5380df