From: Yury Selivanov <yury@magic.io>
Date: Thu, 15 Sep 2016 20:01:56 +0000 (-0400)
Subject: Merge 3.6 (issue #26654)
X-Git-Tag: v3.7.0a1~2476
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ceb5aacaabb226888029df05311b20edcc6e903;p=python

Merge 3.6 (issue #26654)
---

2ceb5aacaabb226888029df05311b20edcc6e903