From: Steve Dower <steve.dower@microsoft.com>
Date: Fri, 24 Jun 2016 17:32:54 +0000 (-0700)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a3~85
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=227cec790b7c9962f4eb613850079f29c6b8ff55;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.5
---

227cec790b7c9962f4eb613850079f29c6b8ff55