From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 30 Aug 2016 07:12:43 +0000 (-0500)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0b1~525
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a582af8a5c25705147d7893ca81c1bda000a3ccd;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.5
---

a582af8a5c25705147d7893ca81c1bda000a3ccd