merge with 3.4

diff --cc Doc/library/json.rst
index 55127c0a1f8b28205ab27a7e9255538dd5fb02e0,b495b496809532a0406bc7f048695651075f6c2f..cff0c727c95d34fcf12d986a2608ec35a7b644a6
--- 1/Doc/library/json.rst
--- 2/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@@ -101,11 -101,9 +101,11 @@@ Using json.tool from the shell to valid
      {
          "json": "obj"
      }
-     $ echo '{1.2:3.4}' | python -mjson.tool
+     $ echo '{1.2:3.4}' | python -m json.tool
      Expecting property name enclosed in double quotes: line 1 column 2 (char 1)
  
 +See :ref:`json-commandline` for detailed documentation.
 +
  .. highlight:: python3
  
  .. note::