From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Fri, 7 Aug 2015 23:47:35 +0000 (-0600)
Subject: Merge from 3.5 (issue #24667).
X-Git-Tag: v3.6.0a1~1815
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5060bc51ca7ad77e418ddfa007a1f6ff27877913;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.5 (issue #24667).
---

5060bc51ca7ad77e418ddfa007a1f6ff27877913