From: Berker Peksag <berker.peksag@gmail.com>
Date: Sun, 12 Jun 2016 09:26:08 +0000 (+0300)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a2~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=89f27e5888af782ed70d5a4040545872cdd093a7;p=python

Merge from 3.5
---

89f27e5888af782ed70d5a4040545872cdd093a7