Merge from 3.6.

diff --cc Misc/NEWS
index 2afaf83aeddd9026aaeeba823e00f4411d772e26,e96581b8b18e35831f6f47704b908db0897e2f4c..dfbbf78d0636947b43479999ffc5ac5d48f879b7
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,8 -10,13 +10,11 @@@ What's New in Python 3.7.0 alpha 
  Core and Builtins
  -----------------
  
+ - Issue #28376: The type of long range iterator is now registered as Iterator.
+   Patch by Oren Milman.
+ 
  - Issue #28376: Creating instances of range_iterator by calling range_iterator
 -  type now is deprecated.  Patch by Oren Milman.
 -
 -- Issue #28376: The constructor of range_iterator now checks that step is not 0.
 +  type now is disallowed.  Calling iter() on range instance is the only way.
    Patch by Oren Milman.
  
  - Issue #26906: Resolving special methods of uninitialized type now causes