Switching to JSON
Merge branch 'heroku/master' into develop-fftf