From: Martin Panter <vadmium>
Date: Mon, 7 Sep 2015 04:07:06 +0000 (+0000)
Subject: Issue #25004: Merge 3.5 into 3.6
X-Git-Tag: v3.6.0a1~1651
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1b8be1fbe5554ff7d145fd7596b07940249ee53f;p=python

Issue #25004: Merge 3.5 into 3.6
---

1b8be1fbe5554ff7d145fd7596b07940249ee53f