From: Stefan Krah <skrah@bytereef.org>
Date: Sat, 4 Feb 2017 13:59:11 +0000 (+0100)
Subject: Merge 3.6.
X-Git-Tag: v3.7.0a1~1417
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=26581785f3625e05d888f120dac9087002d5602e;p=python

Merge 3.6.
---

26581785f3625e05d888f120dac9087002d5602e