From: Berker Peksag <berker.peksag@gmail.com>
Date: Fri, 19 Aug 2016 08:52:08 +0000 (+0300)
Subject: Issue #12946: Merge from 3.5
X-Git-Tag: v3.6.0b1~668
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a01508bbe5fbe5dd31d395d3b7074a643b689a3;p=python

Issue #12946: Merge from 3.5
---

7a01508bbe5fbe5dd31d395d3b7074a643b689a3