From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 16 Oct 2016 22:42:33 +0000 (-0700)
Subject: merge 3.6 (#28454)
X-Git-Tag: v3.7.0a1~2218
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d6d49f16f40338ee7910e1b0cc8c36bdf0170ac3;p=thirdparty%2FPython%2Fcpython.git

merge 3.6 (#28454)
---

d6d49f16f40338ee7910e1b0cc8c36bdf0170ac3