From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 6 Oct 2016 05:54:27 +0000 (-0700)
Subject: merge 3.6
X-Git-Tag: v3.7.0a1~2293
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a1d58efc438926010a3abc5c386c65f9c2e1ca22;p=thirdparty%2FPython%2Fcpython.git

merge 3.6
---

a1d58efc438926010a3abc5c386c65f9c2e1ca22