Use camelCase for JSON properties. Closes #2417.
Merge branch 'master' into gh-pages