From: Georg Brandl <georg@python.org>
Date: Tue, 12 Apr 2016 05:52:22 +0000 (+0200)
Subject: merge with 3.5
X-Git-Tag: v3.6.0a1~228
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2cfa4c7b27c1d860b5c743fc65322d62ac07d2d3;p=python

merge with 3.5
---

2cfa4c7b27c1d860b5c743fc65322d62ac07d2d3