From: Zachary Ware <zachary.ware@gmail.com>
Date: Wed, 9 Dec 2015 08:03:18 +0000 (-0600)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~934
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e0ffe17e72253429eca94664d5b870f643a2a6dc;p=python

Merge with 3.5
---

e0ffe17e72253429eca94664d5b870f643a2a6dc