Fix API json stuff
Merge branch 'master' into reports_status