From: Zachary Ware <zachary.ware@gmail.com>
Date: Thu, 14 Apr 2016 15:22:58 +0000 (-0500)
Subject: Closes #26706: Merge with 3.5
X-Git-Tag: v3.6.0a1~212
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=15d2d49ce685e10deb93a18248d8605d74315e6c;p=thirdparty%2FPython%2Fcpython.git

Closes #26706: Merge with 3.5
---

15d2d49ce685e10deb93a18248d8605d74315e6c