From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Mon, 8 Aug 2016 00:11:06 +0000 (+0300)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a4~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2b1c45ed543d1765ea9e42e4a9b835914ecce3ad;p=python

Merge 3.5
---

2b1c45ed543d1765ea9e42e4a9b835914ecce3ad