From: Berker Peksag <berker.peksag@gmail.com>
Date: Tue, 27 Dec 2016 12:09:55 +0000 (+0300)
Subject: Merge from 3.6
X-Git-Tag: v3.7.0a1~1678
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98feb2a4f55bb7d2f37a065fbd8d9195c4807bd9;p=python

Merge from 3.6
---

98feb2a4f55bb7d2f37a065fbd8d9195c4807bd9