From: Steve Dower <steve.dower@microsoft.com>
Date: Wed, 9 Sep 2015 04:26:59 +0000 (-0700)
Subject: Merge fix for #25029
X-Git-Tag: v3.5.0rc4~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f711a90ea8f88f2098757f44568eb654339df401;p=python

Merge fix for #25029
---

f711a90ea8f88f2098757f44568eb654339df401