From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 14 Sep 2016 05:55:19 +0000 (-0700)
Subject: merge 3.6 (#28081)
X-Git-Tag: v3.7.0a1~2496
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=40465ebc27ec4ec86de055d5de0fc23a4da1205a;p=python

merge 3.6 (#28081)
---

40465ebc27ec4ec86de055d5de0fc23a4da1205a