From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 4 Nov 2015 06:42:42 +0000 (-0800)
Subject: merge 3.5
X-Git-Tag: v3.6.0a1~1128
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f1f9807823897bb81ef7e93f658bb7f62b67071;p=python

merge 3.5
---

0f1f9807823897bb81ef7e93f658bb7f62b67071