From: Zachary Ware <zachary.ware@gmail.com>
Date: Mon, 9 May 2016 19:50:36 +0000 (-0500)
Subject: Closes #26987: Merge with 3.5
X-Git-Tag: v3.6.0a1~50
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e7041fa2158c1c70e5fecb6c56fc9cef0c275fc6;p=python

Closes #26987: Merge with 3.5
---

e7041fa2158c1c70e5fecb6c56fc9cef0c275fc6