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

diff --combined Gruntfile.js
index 3fee6ba,f35d3b2..55b7932
--- 1/Gruntfile.js
--- 2/Gruntfile.js
+++ b/Gruntfile.js
@@@ -22,19 -22,17 +22,18 @@@ module.exports = function ( grunt ) 
                                '**/*.js',
                                '!docs/**',
                                '!tests/**',
 -                              '!extensions/**',
                                '!node_modules/**',
                                '!resources/lib/**',
                                '!resources/src/jquery.tipsy/**',
                                '!resources/src/jquery/jquery.farbtastic.js',
                                '!resources/src/mediawiki.libs/**',
 -                              '!skins/**',
                                '!vendor/**',
 +                              // Explicitly say "**/*.js" here in case of symlinks
 +                              '!extensions/**/*.js',
 +                              '!skins/**/*.js',
                                // Skip functions aren't even parseable
                                '!resources/src/dom-level2-skip.js',
                                '!resources/src/es5-skip.js',
-                               '!resources/src/json-skip.js',
                                '!resources/src/mediawiki.hidpi-skip.js'
                        ]
                },