From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 10 Jul 2016 18:34:25 +0000 (+0300)
Subject: Merge heads
X-Git-Tag: v3.6.0a3~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=763e04b44254aeda1716eb046691e0ac4b01841b;p=python

Merge heads
---

763e04b44254aeda1716eb046691e0ac4b01841b