From: Steve Dower <steve.dower@microsoft.com>
Date: Thu, 17 Nov 2016 00:35:40 +0000 (-0800)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0b4~63
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=be1ed8b028db6248ca6686f5d089fcfe3012d1b0;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.5
---

be1ed8b028db6248ca6686f5d089fcfe3012d1b0