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

Merge the fix for #24267
---

67872ba91a582aaf755548155f71292125e95c68