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

merge 3.5
---

97558412ceb8f3511a01b3186adaeb658bf3e518