From: Stefan Krah <skrah@bytereef.org>
Date: Sun, 8 Jan 2017 00:11:50 +0000 (+0100)
Subject: Merge 3.6.
X-Git-Tag: v3.7.0a1~1610
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4df2ee78c8574416b9f3ef47bfde7f625e5c1cb;p=python

Merge 3.6.
---

f4df2ee78c8574416b9f3ef47bfde7f625e5c1cb