From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 26 Sep 2015 07:09:32 +0000 (-0700)
Subject: merge 3.4
X-Git-Tag: v3.5.1rc1~271
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=03c59b9bef7ca78dd852d2fad381ee0a0dd17e22;p=python

merge 3.4
---

03c59b9bef7ca78dd852d2fad381ee0a0dd17e22