From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 11 Oct 2015 06:24:39 +0000 (-0700)
Subject: merge 3.4
X-Git-Tag: v3.5.1rc1~179
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b16e12aaaa3d6b3f47dc1400e900c2d4aae0f337;p=python

merge 3.4
---

b16e12aaaa3d6b3f47dc1400e900c2d4aae0f337