Merge remote-tracking branch 'adamlofts/1493-fix-zerobyte-json-parsing'