From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 2 Jan 2017 04:07:37 +0000 (-0600)
Subject: merge 3.3
X-Git-Tag: v3.4.6rc1~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b6e2142b0cf96ffd081eff1f4f6d90074efa0ead;p=python

merge 3.3
---

b6e2142b0cf96ffd081eff1f4f6d90074efa0ead