From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 19 Sep 2016 01:00:32 +0000 (-0700)
Subject: merge 3.6
X-Git-Tag: v3.7.0a1~2439
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=190a32f3ed9dceee2db51da5c5cbed41e90895c7;p=python

merge 3.6
---

190a32f3ed9dceee2db51da5c5cbed41e90895c7