From: Steve Dower <steve.dower@microsoft.com>
Date: Mon, 3 Oct 2016 16:15:39 +0000 (-0700)
Subject: Merge from 3.6
X-Git-Tag: v3.7.0a1~2314
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=44cfd3f3fcfc4a2427fd6e1136b5016b56b81883;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.6
---

44cfd3f3fcfc4a2427fd6e1136b5016b56b81883