From: Zachary Ware <zachary.ware@gmail.com>
Date: Wed, 17 Aug 2016 14:52:32 +0000 (-0500)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0b1~681
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=48e4bd6a0278a022a38dc07777834a174adfef55;p=python

Merge with 3.5
---

48e4bd6a0278a022a38dc07777834a174adfef55