From: Berker Peksag <berker.peksag@gmail.com>
Date: Wed, 24 Aug 2016 21:50:59 +0000 (+0300)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0b1~560
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=12f611a47aadf0dc74f3a2c50a610b6cc2c668dc;p=python

Merge from 3.5
---

12f611a47aadf0dc74f3a2c50a610b6cc2c668dc