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

Merge 3.5
---

722b685dc1689412302e28008a207692b20265ba