From: Georg Brandl <georg@python.org>
Date: Fri, 19 Feb 2016 07:57:50 +0000 (+0100)
Subject: merge with 3.5
X-Git-Tag: v3.6.0a1~596
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7db1d1620982d8ed13363e89a86852bd8a6c8b86;p=python

merge with 3.5
---

7db1d1620982d8ed13363e89a86852bd8a6c8b86