From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Mon, 11 Jan 2016 07:09:10 +0000 (+0200)
Subject: merge 3.4
X-Git-Tag: v3.6.0a1~802^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b86abb79aac3d5fb6e30f98c758a3e2cb31bfab3;p=python

merge 3.4
---

b86abb79aac3d5fb6e30f98c758a3e2cb31bfab3