From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 30 Sep 2016 19:39:22 +0000 (-0400)
Subject: Merge with 3.6
X-Git-Tag: v3.7.0a1~2348
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=36925001e6d9290b000722ad2a6ea86dbc27ea09;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.6
---

36925001e6d9290b000722ad2a6ea86dbc27ea09