From: Berker Peksag <berker.peksag@gmail.com>
Date: Sat, 11 Jun 2016 19:41:03 +0000 (+0300)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a2~41
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6bf8e61984f41b1c93a37489a9b54d2d5412c818;p=python

Merge from 3.5
---

6bf8e61984f41b1c93a37489a9b54d2d5412c818