From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 5 Jul 2015 15:39:22 +0000 (-0500)
Subject: merge 3.5
X-Git-Tag: v3.6.0a1~2000
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fdf660a866d09974fecd7c1073a980335b24cd39;p=python

merge 3.5
---

fdf660a866d09974fecd7c1073a980335b24cd39