From: Berker Peksag <berker.peksag@gmail.com>
Date: Fri, 16 Sep 2016 11:45:57 +0000 (+0300)
Subject: Issue #25895: Merge from 3.6
X-Git-Tag: v3.7.0a1~2470
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f670c834431ef5a183657be3ff0d919a248453fb;p=python

Issue #25895: Merge from 3.6
---

f670c834431ef5a183657be3ff0d919a248453fb