From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 30 Aug 2015 21:42:59 +0000 (-0700)
Subject: merge 3.5 (#24963)
X-Git-Tag: v3.6.0a1~1720
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=902adbb3935cffcb080bcee4648b583828e657c0;p=thirdparty%2FPython%2Fcpython.git

merge 3.5 (#24963)
---

902adbb3935cffcb080bcee4648b583828e657c0