From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 6 Jul 2015 16:28:47 +0000 (-0500)
Subject: merge 3.5
X-Git-Tag: v3.6.0a1~1990
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=809868ab63ce7c3e0dab709a3ff23c5abb71226a;p=python

merge 3.5
---

809868ab63ce7c3e0dab709a3ff23c5abb71226a