From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 14 Aug 2016 01:37:20 +0000 (-0700)
Subject: merge 3.5 (closes #27760)
X-Git-Tag: v3.6.0a4~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b6f78c2755489dfcbe4898072ef0cd7dca11ff3d;p=python

merge 3.5 (closes #27760)
---

b6f78c2755489dfcbe4898072ef0cd7dca11ff3d