From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 12 Oct 2016 06:01:12 +0000 (-0700)
Subject: merge 3.6 (#28417)
X-Git-Tag: v3.7.0a1~2242
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a3748290a8f68166de330aef256f5eeaee9ddc3;p=thirdparty%2FPython%2Fcpython.git

merge 3.6 (#28417)
---

8a3748290a8f68166de330aef256f5eeaee9ddc3