From: Zachary Ware <zachary.ware@gmail.com>
Date: Thu, 28 Apr 2016 19:25:32 +0000 (-0500)
Subject: Closes #26874: Merge with 3.5
X-Git-Tag: v3.6.0a1~104
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54559b6511446837a472f667bbe4fea87758163f;p=thirdparty%2FPython%2Fcpython.git

Closes #26874: Merge with 3.5
---

54559b6511446837a472f667bbe4fea87758163f