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

merge 3.4
---

667422dd563e4d639bfed8b32d9b143e249ec6d7