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

Closes #26874: Merge with 3.5
---

5031a678214ef6447291e5e47d344acf1318fb70