From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 1 Jan 2016 16:24:21 +0000 (-0600)
Subject: merge 3.3
X-Git-Tag: v3.4.5rc1~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e8c2a957c87980a1fd79c39597d40e5c5aeb7048;p=python

merge 3.3
---

e8c2a957c87980a1fd79c39597d40e5c5aeb7048