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

merge with 3.5
---

057ab49a6b377f14191027b36158a63d063273af