From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 2 Aug 2015 19:16:45 +0000 (-0700)
Subject: Merge 3.4 (#24217)
X-Git-Tag: v3.6.0a1~1856^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=60e3f367a4fea840df2bb4cd85e007768433e0ad;p=python

Merge 3.4 (#24217)
---

60e3f367a4fea840df2bb4cd85e007768433e0ad