From: Berker Peksag <berker.peksag@gmail.com>
Date: Sat, 30 Jul 2016 00:48:12 +0000 (+0300)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a4~93
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f6daa690e4ee8581e0e5aa87764c0562a16c9330;p=python

Merge from 3.5
---

f6daa690e4ee8581e0e5aa87764c0562a16c9330