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

Merge from 3.5
---

20d458fad68a6196c85d4557532b9a9b183cd5cd