Issue #2395 JSON doc rewrite
Merge pull request #2454 from kipsigman/master

Rewrite of JSON documentation