From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 29 Oct 2016 15:50:42 +0000 (-0700)
Subject: Merge from 3.6
X-Git-Tag: v3.7.0a1~2104
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=842a14667200945b3a350c3ba591ea952069973b;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.6
---

842a14667200945b3a350c3ba591ea952069973b