From: Steve Dower <steve.dower@microsoft.com>
Date: Wed, 5 Aug 2015 18:49:20 +0000 (-0700)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1829
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d66f43d3919d1a9fc6e42df0c955701bd18b8f09;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.5
---

d66f43d3919d1a9fc6e42df0c955701bd18b8f09