From: Serhiy Storchaka <storchaka@gmail.com>
Date: Mon, 24 Oct 2016 11:53:25 +0000 (+0300)
Subject: Merge heads
X-Git-Tag: v3.6.0b3~67
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e89639124b0fb5fa1a6caceb9541a91529182980;p=python

Merge heads
---

e89639124b0fb5fa1a6caceb9541a91529182980