From: Yury Selivanov <yury@magic.io>
Date: Thu, 15 Sep 2016 20:01:35 +0000 (-0400)
Subject: Merge 3.5 (issue #26654)
X-Git-Tag: v3.6.0b2~200
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=62b81c33d146d4f5b36589a93736b57d604cf260;p=python

Merge 3.5 (issue #26654)
---

62b81c33d146d4f5b36589a93736b57d604cf260