From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 17 Aug 2016 06:37:42 +0000 (-0700)
Subject: merge 3.5 (#27783)
X-Git-Tag: v3.6.0b1~695
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d02b1b2bb77ea8c40dea1e3a2f17949e6ebdc63;p=python

merge 3.5 (#27783)
---

4d02b1b2bb77ea8c40dea1e3a2f17949e6ebdc63