From: Georg Brandl <georg@python.org>
Date: Thu, 25 Feb 2016 19:18:00 +0000 (+0100)
Subject: merge with 3.5
X-Git-Tag: v3.6.0a1~568
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d6dd73aec5d594aefa9256999dbe2aab2caf06c;p=python

merge with 3.5
---

6d6dd73aec5d594aefa9256999dbe2aab2caf06c