From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 6 Dec 2016 06:31:20 +0000 (-0800)
Subject: merge 3.6
X-Git-Tag: v3.7.0a1~1837
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=16e49bf4f1f602573337ebc0d26edcb82ff26ef2;p=thirdparty%2FPython%2Fcpython.git

merge 3.6
---

16e49bf4f1f602573337ebc0d26edcb82ff26ef2