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

merge 3.5
---

38bb42c1328b36a8d6e7f879f71069e90617011f