From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 8 Dec 2016 07:55:03 +0000 (-0800)
Subject: merge 3.6 (#28898)
X-Git-Tag: v3.7.0a1~1813
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ebcdac556282b159f5ea2ea480d81cb7cb35ad6;p=python

merge 3.6 (#28898)
---

4ebcdac556282b159f5ea2ea480d81cb7cb35ad6