From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 13 Sep 2015 00:21:16 +0000 (-0700)
Subject: merge 3.4
X-Git-Tag: v3.5.1rc1~364
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f07422c0258d0ba6e3887f71f7d726bcde9adb35;p=python

merge 3.4
---

f07422c0258d0ba6e3887f71f7d726bcde9adb35