From: Joe Watkins <krakjoe@php.net>
Date: Fri, 6 Jan 2017 05:33:22 +0000 (+0000)
Subject: Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
X-Git-Tag: php-7.1.2RC1~159
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a1ff6e72018d1e7de7ce9bd2902a2c7b77b7e240;p=php

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

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

a1ff6e72018d1e7de7ce9bd2902a2c7b77b7e240