From: Zachary Ware <zachary.ware@gmail.com>
Date: Wed, 26 Oct 2016 02:48:29 +0000 (-0500)
Subject: Merge from 3.6
X-Git-Tag: v3.7.0a1~2125
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=52e41fdc26cad1c7266bf6f282ad608325ee7aac;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.6
---

52e41fdc26cad1c7266bf6f282ad608325ee7aac