From: Yury Selivanov <yury@magic.io>
Date: Sat, 11 Jun 2016 15:20:50 +0000 (-0400)
Subject: Merge 3.5 (issue #27223)
X-Git-Tag: v3.6.0a2~50
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6588712bf02e8e9ee374c92e2c1333f2f0029dc2;p=python

Merge 3.5 (issue #27223)
---

6588712bf02e8e9ee374c92e2c1333f2f0029dc2