From: Ned Deily <nad@python.org>
Date: Wed, 7 Dec 2016 07:02:48 +0000 (-0500)
Subject: null merge from 3.6
X-Git-Tag: v3.7.0a1~1822
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c29ba8b48962f59ffd5916731b35ac934f96304a;p=thirdparty%2FPython%2Fcpython.git

null merge from 3.6
---

c29ba8b48962f59ffd5916731b35ac934f96304a