From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 20 Sep 2016 05:17:44 +0000 (-0700)
Subject: merge 3.6 (closes #28184)
X-Git-Tag: v3.7.0a1~2427
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=adaa56ac35260efb4be572003b18846ef0c4b52a;p=thirdparty%2FPython%2Fcpython.git

merge 3.6 (closes #28184)
---

adaa56ac35260efb4be572003b18846ef0c4b52a