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

Issue #23406: Merge 3.5 into 3.6
---

015e3f65bcd0513f1a0d62f1fbddd48edc6af20d