From: Berker Peksag <berker.peksag@gmail.com>
Date: Sat, 31 Dec 2016 19:49:56 +0000 (+0300)
Subject: Issue #29123: Merge from 3.6
X-Git-Tag: v3.7.0a1~1652
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=06c0dca5a65b7bd8741e3806b1f7a1bcb48e1348;p=python

Issue #29123: Merge from 3.6
---

06c0dca5a65b7bd8741e3806b1f7a1bcb48e1348