From: Donald Stufft <donald@stufft.io>
Date: Wed, 6 Jul 2016 21:50:21 +0000 (-0400)
Subject: merge 3.5
X-Git-Tag: v3.6.0a3~30
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=77e84083467420d328e86cbbbda28534460b05ec;p=python

merge 3.5
---

77e84083467420d328e86cbbbda28534460b05ec