From: Steve Dower <steve.dower@microsoft.com>
Date: Thu, 27 Oct 2016 19:15:23 +0000 (-0700)
Subject: Merge from 3.6
X-Git-Tag: v3.7.0a1~2119
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=26d4d763136af35302cea5cfac018d1467526700;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.6
---

26d4d763136af35302cea5cfac018d1467526700