From: Brett Cannon <brett@python.org>
Date: Sun, 21 Feb 2016 02:40:18 +0000 (-0800)
Subject: Merge w/ 3.5
X-Git-Tag: v3.6.0a1~591
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fe1941ebf87de4fe9761d81b477c67964eea982e;p=python

Merge w/ 3.5
---

fe1941ebf87de4fe9761d81b477c67964eea982e