From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 29 Sep 2016 06:17:12 +0000 (-0700)
Subject: merge 3.6 (#1703178)
X-Git-Tag: v3.7.0a1~2358
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6224b678651bae90db24c5ad547e6c8930e55bdd;p=thirdparty%2FPython%2Fcpython.git

merge 3.6 (#1703178)
---

6224b678651bae90db24c5ad547e6c8930e55bdd