Match the style of input JSON to the style used in output.  Fixes #187.
Merge remote-tracking branch 'upstream/develop' into match-input-output