Better JSON formatting on export
Merge branch 'master' into gh-pages