From: Donald Stufft <donald@stufft.io>
Date: Fri, 9 Sep 2016 16:14:43 +0000 (-0400)
Subject: Merge 3.4
X-Git-Tag: v3.6.0b1~212^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6bde454f9e8bb9139f3e9042c527b9ff15373246;p=python

Merge 3.4
---

6bde454f9e8bb9139f3e9042c527b9ff15373246