From: Berker Peksag <berker.peksag@gmail.com>
Date: Sat, 17 Sep 2016 13:21:42 +0000 (+0300)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0b2~187
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d2154ab0b728c8b5f5ec44d3496e8760a0504581;p=python

Merge from 3.5
---

d2154ab0b728c8b5f5ec44d3496e8760a0504581