From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 12 Jun 2016 06:48:19 +0000 (+0300)
Subject: Merge heads
X-Git-Tag: v3.6.0a2~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4aa15a0d0dbf5d4a9172ff3187ad458452ae3f68;p=python

Merge heads
---

4aa15a0d0dbf5d4a9172ff3187ad458452ae3f68