From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 16 Oct 2016 22:42:24 +0000 (-0700)
Subject: merge 3.5 (#28454)
X-Git-Tag: v3.6.0b3~115
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3aa75528a1eb47b1f3bd5b681bacf9dab27186b9;p=python

merge 3.5 (#28454)
---

3aa75528a1eb47b1f3bd5b681bacf9dab27186b9