From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 21 Sep 2016 03:39:44 +0000 (-0700)
Subject: merge 3.6
X-Git-Tag: v3.7.0a1~2422
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=637d1e2b0a7b12c25e1191a99d7297eadcd4c921;p=thirdparty%2FPython%2Fcpython.git

merge 3.6
---

637d1e2b0a7b12c25e1191a99d7297eadcd4c921