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

Merge from 3.5
---

19b2a53a82c8f4d179efdc39fb39f766191cac2b