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

merge 3.6 (#28472)
---

26d0ccd51bc02177c04e5271448ce42ea0931de8