From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 2 Jan 2017 04:09:34 +0000 (-0600)
Subject: merge 3.6
X-Git-Tag: v3.7.0a1~1642
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4fb5e76dcae03c2930e61207b4b32b7987ba302f;p=thirdparty%2FPython%2Fcpython.git

merge 3.6
---

4fb5e76dcae03c2930e61207b4b32b7987ba302f