Merge "Remove JSON polyfill, deprecate 'json' module"