From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 6 Feb 2015 03:29:46 +0000 (-0500)
Subject: merge 3.4 (#22735)
X-Git-Tag: v3.5.0a1~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6c62ac1a0168529dd17f8d3cbc9182dd5f95cb14;p=python

merge 3.4 (#22735)
---

6c62ac1a0168529dd17f8d3cbc9182dd5f95cb14