From: Donald Stufft <donald@stufft.io>
Date: Wed, 3 Aug 2016 22:49:46 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a4~78
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2af36ac04f9c66e5a798e32aae02b0baa09ae0bd;p=python

Merge 3.5
---

2af36ac04f9c66e5a798e32aae02b0baa09ae0bd