From: Yury Selivanov <yury@magic.io>
Date: Thu, 20 Oct 2016 17:11:48 +0000 (-0400)
Subject: Merge 3.6 (issue #26010)
X-Git-Tag: v3.7.0a1~2188
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5246f6227aeff6b4471ab6927525ef706dbfb590;p=python

Merge 3.6 (issue #26010)
---

5246f6227aeff6b4471ab6927525ef706dbfb590