Merge json-editor changes from upstream.