From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 18 Aug 2015 06:38:55 +0000 (-0700)
Subject: Merge 3.5 (#24883)
X-Git-Tag: v3.6.0a1~1766
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac48a4173dc4f96ec26a3816945cfcc3f7293a4e;p=python

Merge 3.5 (#24883)
---

ac48a4173dc4f96ec26a3816945cfcc3f7293a4e