From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 8 Nov 2016 04:15:10 +0000 (-0500)
Subject: Merge with 3.6
X-Git-Tag: v3.7.0a1~2041
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e83a64164ef20b0e15ad1f6b259cbe4e0a29be07;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.6
---

e83a64164ef20b0e15ad1f6b259cbe4e0a29be07