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

Merge 3.4
---

621333d2276d1d39728e19261585d90b7f58bb47