From: Steve Dower <steve.dower@microsoft.com>
Date: Tue, 17 May 2016 15:58:04 +0000 (-0700)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a2~279
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=50f09f5e30ecfdb67b4254f3a7a50ea53781bb97;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.5
---

50f09f5e30ecfdb67b4254f3a7a50ea53781bb97