Merge from 3.5.

diff --cc Lib/_collections_abc.py
Simple merge

diff --cc Misc/NEWS
index fb6e3b9f9379a247dff872748ce269c540b5d239,a89afa9399b00181335c8c46722debd23765bd1c..e96581b8b18e35831f6f47704b908db0897e2f4c
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,9 -10,9 +10,12 @@@ What's New in Python 3.6.0 beta 
  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.
    Patch by Oren Milman.