From: Serhiy Storchaka <storchaka@gmail.com>
Date: Fri, 11 Sep 2015 17:56:05 +0000 (+0300)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1579
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d31570837a63328397ff193d7223bbf500f68b4;p=python

Merge 3.5
---

4d31570837a63328397ff193d7223bbf500f68b4