From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 27 Sep 2015 09:14:23 +0000 (-0700)
Subject: merge 3.4
X-Git-Tag: v3.5.1rc1~261
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a18bd0e0f0dc4ad8dd52c4c39fec730dbd283cc5;p=python

merge 3.4
---

a18bd0e0f0dc4ad8dd52c4c39fec730dbd283cc5