From: Berker Peksag <berker.peksag@gmail.com>
Date: Tue, 3 Jan 2017 00:36:15 +0000 (+0300)
Subject: Issue #29012: Merge from 3.6
X-Git-Tag: v3.7.0a1~1637
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c9c760d6ecacfd08f0ec55ebb7ac54757372d3c5;p=python

Issue #29012: Merge from 3.6
---

c9c760d6ecacfd08f0ec55ebb7ac54757372d3c5