Change JSON include to enable amalgamated version
Merge branch 'master' into withjson