From: Andrew Kuchling <amk@amk.ca>
Date: Wed, 9 Nov 2016 03:53:59 +0000 (-0500)
Subject: Merge 3.6
X-Git-Tag: v3.7.0a1~2026
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=211112a670ef495640c550bfdfe309f716bdd640;p=python

Merge 3.6
---

211112a670ef495640c550bfdfe309f716bdd640