From: Donald Stufft <donald@stufft.io>
Date: Thu, 17 Mar 2016 15:01:04 +0000 (-0400)
Subject: Merge 3.4 into 3.5
X-Git-Tag: v3.6.0a1~450^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c488bc6a76b99f579039edaa52aeb26e54f96d3b;p=python

Merge 3.4 into 3.5
---

c488bc6a76b99f579039edaa52aeb26e54f96d3b