Update JSON2 and add json_parse
Merge pull request #2346 from d10/master

Update JSON2 and add json_parse