Attempt 2 to fix json
Merge branch 'dev' into gh-pages