From: Steve Dower <steve.dower@microsoft.com>
Date: Sun, 20 Nov 2016 05:14:37 +0000 (-0800)
Subject: Merge from 3.6
X-Git-Tag: v3.7.0a1~1950
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=17c27d7c7d2451f7929423c356326b46960ba565;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.6
---

17c27d7c7d2451f7929423c356326b46960ba565