From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 13 Sep 2016 05:07:27 +0000 (-0700)
Subject: merge 3.6 (#27981)
X-Git-Tag: v3.7.0a1~2518
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98deab5e4ec3d02f01ee9066ca308de187c1638e;p=python

merge 3.6 (#27981)
---

98deab5e4ec3d02f01ee9066ca308de187c1638e