From: Donald Stufft <donald@stufft.io>
Date: Tue, 2 Jun 2015 14:38:21 +0000 (-0400)
Subject: Merge the fix for #24267
X-Git-Tag: v3.6.0a1~2120
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75124e08c553dc7e0fd09dc8858e083342162619;p=python

Merge the fix for #24267
---

75124e08c553dc7e0fd09dc8858e083342162619