From: Zachary Ware <zachary.ware@gmail.com>
Date: Fri, 1 Jan 2016 18:24:12 +0000 (-0600)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~832
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bdce29b9a475b1fc99ed34be92ced757c745f5af;p=python

Merge with 3.5
---

bdce29b9a475b1fc99ed34be92ced757c745f5af