From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Thu, 24 Sep 2015 11:35:16 +0000 (+0300)
Subject: Merge 3.4 -> 3.5
X-Git-Tag: v3.5.1rc1~279
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1c99e529dde252f6d1e3d727aa9d2deef97c231c;p=python

Merge 3.4 -> 3.5
---

1c99e529dde252f6d1e3d727aa9d2deef97c231c