From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 27 Jun 2015 19:18:44 +0000 (-0500)
Subject: merge 3.5
X-Git-Tag: v3.6.0a1~2039
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ad880a98aad044119e2d80654e4a641e2504871;p=python

merge 3.5
---

3ad880a98aad044119e2d80654e4a641e2504871