Error in json. string not an int
Merge branch 'master' into release
fix to json