silly json fix
#ifndef JSON_IS_AMALGAMATION
Merge branch 'json-fix' into develop