Merge branch 'json' into libupload