Merge with 3.1.

diff --cc Lib/json/decoder.py
Simple merge

diff --cc Lib/test/json_tests/test_decode.py
Simple merge

diff --cc Lib/test/json_tests/test_scanstring.py
Simple merge

diff --cc Lib/test/json_tests/test_speedups.py
Simple merge

diff --cc Misc/NEWS
index e16db92e4a6221a8263447e3219cea1da1dcc8b8,6a4da30c3fa00171593604670457a977dcb0c3f9..6d902bf475c0e77c8dd24d4ccdae41defc4f738f
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -53,11 -51,11 +53,14 @@@ Core and Builtin
  Library
  -------
  
- - Issue #11830: Remove unnecessary introspection code in the decimal module.                                                                
 -- Issue #9233: Fix json to work properly even when _json is not available.
++- Issue #9233: Fix json.loads('{}') to return a dict (instead of a list), when
++  _json is not available.
 +
- - Issue #11703 - urllib2.geturl() does not return correct url when the original
++- Issue #11830: Remove unnecessary introspection code in the decimal module.
+ 
+ - Issue #11703: urllib2.geturl() does not return correct url when the original
    url contains #fragment.
-   
+ 
  - Issue #10019: Fixed regression in json module where an indent of 0 stopped
    adding newlines and acted instead like 'None'.