From: Serhiy Storchaka <storchaka@gmail.com>
Date: Mon, 7 Sep 2015 16:52:12 +0000 (+0300)
Subject: Merge 3.5.
X-Git-Tag: v3.6.0a1~1647
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=39d65420550cc2a3d7cdb2e6213c2382fed727e2;p=python

Merge 3.5.
---

39d65420550cc2a3d7cdb2e6213c2382fed727e2