From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 6 Sep 2016 01:26:26 +0000 (-0700)
Subject: merge 3.5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9d1e4a54f792a8a15b27847d7c0518ab9e9cead0;p=python

merge 3.5
---

9d1e4a54f792a8a15b27847d7c0518ab9e9cead0