From: Zachary Ware <zachary.ware@gmail.com>
Date: Fri, 9 Sep 2016 20:11:58 +0000 (-0700)
Subject: Closes #19489: Merge with 3.5
X-Git-Tag: v3.6.0b1~177
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9c858284639ce98c79d2c33fe639a0dcb7febc5d;p=thirdparty%2FPython%2Fcpython.git

Closes #19489: Merge with 3.5
---

9c858284639ce98c79d2c33fe639a0dcb7febc5d