From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 25 Oct 2016 06:00:27 +0000 (-0700)
Subject: merge 3.6 (#28525)
X-Git-Tag: v3.7.0a1~2146
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0af16b4a5654d45a35fe8801c6595e0219fb2319;p=thirdparty%2FPython%2Fcpython.git

merge 3.6 (#28525)
---

0af16b4a5654d45a35fe8801c6595e0219fb2319