From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 2 Jul 2015 03:36:37 +0000 (-0500)
Subject: merge 3.5
X-Git-Tag: v3.6.0a1~2017
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=63d80b71b3cc5a1180026a77e6329e0324974b3d;p=python

merge 3.5
---

63d80b71b3cc5a1180026a77e6329e0324974b3d