From: Jason R. Coombs <jaraco@jaraco.com>
Date: Sun, 6 Nov 2016 16:16:42 +0000 (-0500)
Subject: Merge with 3.6
X-Git-Tag: v3.7.0a1~2057
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=32d93b2dc8e73af1965ec1986a84fefea17f30e4;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.6
---

32d93b2dc8e73af1965ec1986a84fefea17f30e4