From: Georg Brandl <georg@python.org>
Date: Sun, 28 Feb 2016 20:09:45 +0000 (+0100)
Subject: merge with 3.5
X-Git-Tag: v3.6.0a1~555
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a7f7232838b4c2e6b0771b402f160c334cc74eb9;p=python

merge with 3.5
---

a7f7232838b4c2e6b0771b402f160c334cc74eb9