From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 7 Oct 2015 02:42:02 +0000 (-0700)
Subject: merge 3.4 (#24806)
X-Git-Tag: v3.5.1rc1~203
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=59dc696821da8888b5ac1b86c6c0fd4202f92b39;p=python

merge 3.4 (#24806)
---

59dc696821da8888b5ac1b86c6c0fd4202f92b39