From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 11 Oct 2015 02:32:41 +0000 (-0700)
Subject: merge 3.5 (#25371)
X-Git-Tag: v3.6.0a1~1270
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=90ccccf9ed408f2a70c253fc2b5f4b3b5f4da33f;p=python

merge 3.5 (#25371)
---

90ccccf9ed408f2a70c253fc2b5f4b3b5f4da33f