From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 11 Oct 2015 06:24:53 +0000 (-0700)
Subject: merge 3.5 (#25375)
X-Git-Tag: v3.6.0a1~1267
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6da624098fab54b3f22c522806c74f352a8f6e5c;p=python

merge 3.5 (#25375)
---

6da624098fab54b3f22c522806c74f352a8f6e5c