From: Steve Dower <steve.dower@microsoft.com>
Date: Mon, 16 May 2016 18:05:00 +0000 (-0700)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a2~292
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa99b8e36594242d7ef2f61cd03a1dd35bd018c8;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.5
---

aa99b8e36594242d7ef2f61cd03a1dd35bd018c8