From: Donald Stufft <donald@stufft.io>
Date: Sat, 29 Aug 2015 22:00:26 +0000 (-0400)
Subject: Null Merge from 3.5.0 to 3.5.1
X-Git-Tag: v3.6.0a1~1724^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ed9bf85a686e716649a01ff1a25a4f7065b3558;p=python

Null Merge from 3.5.0 to 3.5.1
---

3ed9bf85a686e716649a01ff1a25a4f7065b3558