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

merge 3.5
---

f7272a667e9964fd203ab21ca6fe12f0e5b38a8a