From: Donald Stufft <donald@stufft.io>
Date: Fri, 9 Sep 2016 16:15:07 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0b1~212
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=783c9ef84dad5fc136a271ccd7fc30d2e556a58e;p=python

Merge 3.5
---

783c9ef84dad5fc136a271ccd7fc30d2e556a58e