From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 30 Aug 2016 06:41:35 +0000 (-0500)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0b1~526
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6dd11094f2b8e31d057de9a7ab87fde5b93f5206;p=python

Merge with 3.5
---

6dd11094f2b8e31d057de9a7ab87fde5b93f5206