From: Berker Peksag <berker.peksag@gmail.com>
Date: Mon, 26 Sep 2016 19:50:32 +0000 (+0300)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0b2~118
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8d08265f5ee09835ba725d79b0bd4800b6c8db85;p=python

Merge from 3.5
---

8d08265f5ee09835ba725d79b0bd4800b6c8db85