From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 6 Jul 2016 21:00:46 +0000 (-0700)
Subject: merge 3.5
X-Git-Tag: v3.6.0a3~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=961900ad85240f999ea7be9f03e07c52ba63c051;p=python

merge 3.5
---

961900ad85240f999ea7be9f03e07c52ba63c051