From: Ned Deily <nad@python.org>
Date: Tue, 4 Oct 2016 18:52:01 +0000 (-0400)
Subject: null merge from 3.6
X-Git-Tag: v3.7.0a1~2301
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5041a04ee395cbccb0ae46219f626939343becb8;p=thirdparty%2FPython%2Fcpython.git

null merge from 3.6
---

5041a04ee395cbccb0ae46219f626939343becb8