From: Yury Selivanov <yury@magic.io>
Date: Fri, 21 Oct 2016 21:42:00 +0000 (-0400)
Subject: Merge 3.6 (issue #26796)
X-Git-Tag: v3.7.0a1~2168
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c69d95210978ea28ce054a44e2d6f19ac71d1ad3;p=python

Merge 3.6 (issue #26796)
---

c69d95210978ea28ce054a44e2d6f19ac71d1ad3