From: Nick Coghlan <ncoghlan@gmail.com>
Date: Wed, 5 Aug 2015 13:24:55 +0000 (+1000)
Subject: Merge issue #24129 from 3.5
X-Git-Tag: v3.6.0a1~1835
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=94b17d7685154d7bc5f14242f812ab1ec475028b;p=python

Merge issue #24129 from 3.5
---

94b17d7685154d7bc5f14242f812ab1ec475028b