From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 27 Sep 2015 07:09:09 +0000 (-0700)
Subject: merge 3.5 (#23329)
X-Git-Tag: v3.6.0a1~1429
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c78f27d239d6f82b3dbf6393638dad5d6efcae35;p=python

merge 3.5 (#23329)
---

c78f27d239d6f82b3dbf6393638dad5d6efcae35