From: Donald Stufft <donald@stufft.io>
Date: Sun, 14 Aug 2016 20:10:31 +0000 (-0400)
Subject: merge 3.5
X-Git-Tag: v3.6.0a4~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=704813f1ad6841b289883dfb3cefebef65924713;p=python

merge 3.5
---

704813f1ad6841b289883dfb3cefebef65924713