From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 26 Sep 2015 05:44:55 +0000 (-0700)
Subject: merge 3.5 (#25131)
X-Git-Tag: v3.6.0a1~1441
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00d4442979af67735b90a70d21168b14eb84b43e;p=python

merge 3.5 (#25131)
---

00d4442979af67735b90a70d21168b14eb84b43e