From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 10 Sep 2016 01:05:07 +0000 (-0700)
Subject: Merge from Zach
X-Git-Tag: v3.6.0b1~135
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=48c7d7518ef59569ac555a0e743809737a4e41ce;p=thirdparty%2FPython%2Fcpython.git

Merge from Zach
---

48c7d7518ef59569ac555a0e743809737a4e41ce