From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 4 Jun 2016 05:38:10 +0000 (-0700)
Subject: merge 3.5
X-Git-Tag: v3.6.0a2~150
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f22e3608952de845a3dc9993ca5dc685e695fd07;p=python

merge 3.5
---

f22e3608952de845a3dc9993ca5dc685e695fd07