From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 7 Sep 2016 03:42:17 +0000 (-0700)
Subject: merge 3.5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b9abf3a27185aaceb6db39ef1e1fa784f420b4f;p=python

merge 3.5
---

4b9abf3a27185aaceb6db39ef1e1fa784f420b4f