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

merge 3.6
---

369d911402dcc0a7e4fa94879f70ffa4b0978dfd