From: Ned Deily <nad@python.org>
Date: Mon, 10 Oct 2016 19:34:47 +0000 (-0400)
Subject: merge with 3.6
X-Git-Tag: v3.7.0a1~2252
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=96feeab0e2de7b17bf4b286018b5778a66899057;p=thirdparty%2FPython%2Fcpython.git

merge with 3.6
---

96feeab0e2de7b17bf4b286018b5778a66899057