From: Steve Dower <steve.dower@microsoft.com>
Date: Fri, 17 Jul 2015 18:59:57 +0000 (-0700)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1960
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6160b357b927c3cf9e86b43df7f68d066f68721b;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.5
---

6160b357b927c3cf9e86b43df7f68d066f68721b