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

Issue #6057: Merge from 3.5
---

c7876464e7b3ea0fb118afa1ec13d1849f7fa42d