JSON fixes for Shiffman
Merge branch 'master' of github.com:processing/processing