From: Steve Dower <steve.dower@microsoft.com>
Date: Mon, 27 Jun 2016 19:31:00 +0000 (-0700)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a3~58
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2977cdcee4396b6cb8df4ce0d924b6b3cdbcf2b4;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.5
---

2977cdcee4396b6cb8df4ce0d924b6b3cdbcf2b4