From: Nick Coghlan <ncoghlan@gmail.com>
Date: Thu, 4 Jun 2015 11:58:16 +0000 (+1000)
Subject: Merge fix for issue #24373 from 3.5
X-Git-Tag: v3.6.0a1~2106
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e25baa8e8985b502bf03d6b777ecf1f337d19ba9;p=python

Merge fix for issue #24373 from 3.5
---

e25baa8e8985b502bf03d6b777ecf1f337d19ba9