Merge from 3.5.

diff --cc Lib/test/test_collections.py
index c6db13ecfb5460970773095871d86bef27b9222b,3f02129c1dfc4d526987d8bcd37c0e66b6014ca2..5836cb37ea02efe12b3a4ef35d42965f9a901f3e
--- 1/Lib/test/test_collections.py
--- 2/Lib/test/test_collections.py
+++ b/Lib/test/test_collections.py
@@@ -1965,14 -1978,6 +1978,13 @@@ class OrderedDictTests
          od = OrderedDict(**d)
          self.assertGreater(sys.getsizeof(od), sys.getsizeof(d))
  
-         OrderedDict = self.module.OrderedDict
 +    def test_views(self):
 +        # See http://bugs.python.org/issue24286
 +        s = 'the quick brown fox jumped over a lazy dog yesterday before dawn'.split()
 +        od = OrderedDict.fromkeys(s)
 +        self.assertEqual(od.keys(), dict(od).keys())
 +        self.assertEqual(od.items(), dict(od).items())
 +
      def test_override_update(self):
          OrderedDict = self.module.OrderedDict
          # Verify that subclasses can override update() without breaking __init__()