From: Berker Peksag <berker.peksag@gmail.com>
Date: Tue, 5 Jul 2016 14:08:52 +0000 (+0300)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a3~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e3c1d34c653b24a7d956f6b6ab12094546cf8920;p=python

Merge from 3.5
---

e3c1d34c653b24a7d956f6b6ab12094546cf8920