From: Zachary Ware <zachary.ware@gmail.com>
Date: Mon, 28 Nov 2016 06:19:23 +0000 (-0600)
Subject: Merge with 3.6
X-Git-Tag: v3.7.0a1~1875
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d070b2ddbb300cb9c25efcef453154fabc99bcde;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.6
---

d070b2ddbb300cb9c25efcef453154fabc99bcde