From: Yury Selivanov <yury@magic.io>
Date: Wed, 9 Nov 2016 00:05:42 +0000 (-0500)
Subject: Merge 3.6 (issue #26081)
X-Git-Tag: v3.7.0a1~2031
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bff8f647a97bbb7fb91d0a02b6133e5312410ca7;p=python

Merge 3.6 (issue #26081)
---

bff8f647a97bbb7fb91d0a02b6133e5312410ca7