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

Merge from 3.5
---

44a98b6bf3f110c900979894ccb89753088c3aaa