From: Łukasz Langa <lukasz@langa.pl>
Date: Fri, 10 Feb 2017 08:20:16 +0000 (-0800)
Subject: Merge 3.6 (fix #29519)
X-Git-Tag: v3.7.0a1~1380
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=40ee824d1dac41fd1aba9fa9a4e6e5fb353f2666;p=python

Merge 3.6 (fix #29519)
---

40ee824d1dac41fd1aba9fa9a4e6e5fb353f2666