From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 6 Nov 2016 21:01:15 +0000 (-0800)
Subject: merge 3.5
X-Git-Tag: v3.6.0b4~142
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3bd79001555df15181524a0ba6843db3a0d3b03c;p=python

merge 3.5
---

3bd79001555df15181524a0ba6843db3a0d3b03c