From: Georg Brandl <georg@python.org>
Date: Fri, 26 Feb 2016 18:16:43 +0000 (+0100)
Subject: merge with 3.5
X-Git-Tag: v3.6.0a1~561
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb73563f48c950389513c695204d4be0808b63d1;p=python

merge with 3.5
---

eb73563f48c950389513c695204d4be0808b63d1