From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Thu, 1 Oct 2015 06:49:03 +0000 (+0300)
Subject: Merge 3.5 -> default
X-Git-Tag: v3.6.0a1~1362
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a91b7e0dc7c7000b121f96ccb5ad9e6c6988a47e;p=python

Merge 3.5 -> default
---

a91b7e0dc7c7000b121f96ccb5ad9e6c6988a47e