From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 22 Mar 2016 05:31:31 +0000 (-0700)
Subject: merge 3.5 (#17167)
X-Git-Tag: v3.6.0a1~412
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2efdc8c7c1bbd8b1b017d692c0607f4b26245e2d;p=python

merge 3.5 (#17167)
---

2efdc8c7c1bbd8b1b017d692c0607f4b26245e2d