From: Yury Selivanov <yselivanov@sprymix.com>
Date: Thu, 23 Jul 2015 14:10:24 +0000 (+0300)
Subject: Merge 3.5 (issues #21217, #24485).
X-Git-Tag: v3.6.0a1~1924
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=28cff18dedaf994109a1c4c8f363a076941e1ba3;p=thirdparty%2FPython%2Fcpython.git

Merge 3.5 (issues #21217, #24485).
---

28cff18dedaf994109a1c4c8f363a076941e1ba3