From: Ned Deily <nad@python.org>
Date: Tue, 6 Dec 2016 22:02:03 +0000 (-0500)
Subject: Merge from 3.6
X-Git-Tag: v3.7.0a1~1827
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=716636caa5f0ec4c0810e28d5f7f112c3a88d56b;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.6
---

716636caa5f0ec4c0810e28d5f7f112c3a88d56b