From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 2 Jan 2017 02:21:54 +0000 (-0500)
Subject: Merge with 3.6
X-Git-Tag: v3.7.0a1~1650
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bade830a211ef2986414ba1e60478325aeb0a45c;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.6
---

bade830a211ef2986414ba1e60478325aeb0a45c