From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 13 May 2016 06:14:28 +0000 (-0700)
Subject: merge 3.5
X-Git-Tag: v3.6.0a1~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=99740925ed5472e0c0c22ee01d0f2250d9287ff9;p=python

merge 3.5
---

99740925ed5472e0c0c22ee01d0f2250d9287ff9