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

Merge from 3.6
---

f97167cedabb85bcdb0837f26991fbaa8a99ff60