From: Yury Selivanov <yselivanov@sprymix.com>
Date: Wed, 24 Jun 2015 15:45:21 +0000 (-0400)
Subject: Merge 3.5 (Issue #24325, #24400)
X-Git-Tag: v3.6.0a1~2046
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ff9284bcb74ad351f425e88a66e737b689b9c777;p=thirdparty%2FPython%2Fcpython.git

Merge 3.5 (Issue #24325, #24400)
---

ff9284bcb74ad351f425e88a66e737b689b9c777