From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 19 Sep 2016 06:43:18 +0000 (-0700)
Subject: merge 3.4
X-Git-Tag: v3.6.0b2~160^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=57bda335e1ec1e5dfa7972ad118f0a1e5f539ec6;p=python

merge 3.4
---

57bda335e1ec1e5dfa7972ad118f0a1e5f539ec6