From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Mon, 11 Jan 2016 10:26:02 +0000 (+0200)
Subject: merge 3.5
X-Git-Tag: v3.6.0a1~800
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=511bf7880cdc24f86ee4a94eea28a10f5805a7e9;p=python

merge 3.5
---

511bf7880cdc24f86ee4a94eea28a10f5805a7e9