From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 11 Sep 2015 04:11:26 +0000 (-0700)
Subject: merge 3.5 (#25060)
X-Git-Tag: v3.6.0a1~1587
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7920b7063d28c8032f30eb7dd87cd88113e9741c;p=python

merge 3.5 (#25060)
---

7920b7063d28c8032f30eb7dd87cd88113e9741c