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

Merge 3.6.
---

aaa67862e87479699779ac6903f35f1848b97968