From: Steve Dower <steve.dower@microsoft.com>
Date: Thu, 8 Oct 2015 16:06:39 +0000 (-0700)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a1~1302
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=666e6e1b4b7990c7095b1c37a742bcda585126d9;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.5
---

666e6e1b4b7990c7095b1c37a742bcda585126d9