From: Zachary Ware <zachary.ware@gmail.com>
Date: Thu, 12 Nov 2015 05:00:01 +0000 (-0600)
Subject: Closes #25603: Merge with 3.5
X-Git-Tag: v3.6.0a1~1081
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6e6ee30aad72425dd5a13c7a507f515318b1309e;p=thirdparty%2FPython%2Fcpython.git

Closes #25603: Merge with 3.5
---

6e6ee30aad72425dd5a13c7a507f515318b1309e