Saving JSON was done incorrectly in the first pass.  This method now correctly saves JSON objects
Merge branch 'json-support'