From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 16 Aug 2016 05:05:16 +0000 (-0700)
Subject: merge 3.5 (#27774)
X-Git-Tag: v3.6.0b1~711
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0a3ccacec7a5b05db7cd6187d359aa5146459e09;p=python

merge 3.5 (#27774)
---

0a3ccacec7a5b05db7cd6187d359aa5146459e09