From: Berker Peksag <berker.peksag@gmail.com>
Date: Thu, 4 Aug 2016 14:26:00 +0000 (+0300)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a4~72
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6090194ef72b6e169cdf96a1a4f703a619b63b45;p=python

Merge from 3.5
---

6090194ef72b6e169cdf96a1a4f703a619b63b45