From: Ned Deily <nad@python.org>
Date: Sat, 17 Dec 2016 04:17:52 +0000 (-0500)
Subject: Null merge from 3.6
X-Git-Tag: v3.7.0a1~1728
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b06cde61a2105cf9e0ec52fd7e2c131ae0cd15fa;p=thirdparty%2FPython%2Fcpython.git

Null merge from 3.6
---

b06cde61a2105cf9e0ec52fd7e2c131ae0cd15fa