From: Berker Peksag <berker.peksag@gmail.com>
Date: Thu, 15 Sep 2016 17:33:08 +0000 (+0300)
Subject: Merge from 3.6
X-Git-Tag: v3.7.0a1~2483
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=35cb7a62fe53c3399cbb50f6ef64622a5f8d9cec;p=python

Merge from 3.6
---

35cb7a62fe53c3399cbb50f6ef64622a5f8d9cec