From: Serhiy Storchaka <storchaka@gmail.com>
Date: Wed, 21 Sep 2016 12:56:57 +0000 (+0300)
Subject: Merge heads
X-Git-Tag: v3.6.0b2~145
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=349f552507dbdd401202f36621928342030fe2a1;p=python

Merge heads
---

349f552507dbdd401202f36621928342030fe2a1