From: Stefan Krah <skrah@bytereef.org>
Date: Mon, 9 Jan 2017 12:12:09 +0000 (+0100)
Subject: Merge 3.6.
X-Git-Tag: v3.7.0a1~1595
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a40a3f35ebd1c99d7ee4b884f1508fa4136a5fd6;p=python

Merge 3.6.
---

a40a3f35ebd1c99d7ee4b884f1508fa4136a5fd6