From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Wed, 3 Jun 2015 16:54:05 +0000 (-0600)
Subject: Merge from 3.5.
X-Git-Tag: v3.6.0a1~2112
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cbdb17f681fffba35a805f832f1b5bf99adcc312;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.5.
---

cbdb17f681fffba35a805f832f1b5bf99adcc312