From: Berker Peksag <berker.peksag@gmail.com>
Date: Tue, 13 Sep 2016 02:53:01 +0000 (+0300)
Subject: Merge from 3.6
X-Git-Tag: v3.7.0a1~2519
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4c16fa364e122e5e3810b43d490208c8ff07a8e;p=python

Merge from 3.6
---

e4c16fa364e122e5e3810b43d490208c8ff07a8e