From: Berker Peksag <berker.peksag@gmail.com>
Date: Sat, 6 Aug 2016 00:00:30 +0000 (+0300)
Subject: Issue #18548: Merge from 3.5
X-Git-Tag: v3.6.0a4~65
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=933c66af56f315bca6f0f8b605db0831e3685d24;p=python

Issue #18548: Merge from 3.5
---

933c66af56f315bca6f0f8b605db0831e3685d24