From: Yury Selivanov <yury@magic.io>
Date: Thu, 15 Sep 2016 19:46:16 +0000 (-0400)
Subject: Merge 3.5 (issue #28174)
X-Git-Tag: v3.6.0b2~201
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1b984ffd44f036cf5c0ce1933c0fb9ba6e94948a;p=python

Merge 3.5 (issue #28174)
---

1b984ffd44f036cf5c0ce1933c0fb9ba6e94948a