From: Kristján Valur Jónsson <sweskman@gmail.com>
Date: Sat, 12 Sep 2015 16:34:33 +0000 (+0000)
Subject: Issue #25021: Merge 3.4 to 3.5
X-Git-Tag: v3.5.1rc1~368
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d7f65e5763fdf16afa0dc786bcc3e40024037aaf;p=python

Issue #25021: Merge 3.4 to 3.5
---

d7f65e5763fdf16afa0dc786bcc3e40024037aaf