From: Zachary Ware <zachary.ware@gmail.com>
Date: Fri, 18 Nov 2016 05:31:29 +0000 (-0600)
Subject: Merge with 3.6
X-Git-Tag: v3.7.0a1~1960
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3d1caab7b9db82453390d98b9b1bf7fbcb25cdd8;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.6
---

3d1caab7b9db82453390d98b9b1bf7fbcb25cdd8