From: Zachary Ware <zachary.ware@gmail.com>
Date: Thu, 12 Nov 2015 05:34:00 +0000 (-0600)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1080
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fe6d54bf5dd63cc339212b8e76d4afb01d8d89b2;p=python

Merge with 3.5
---

fe6d54bf5dd63cc339212b8e76d4afb01d8d89b2