From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 24 May 2016 05:48:05 +0000 (-0700)
Subject: merge 3.5 (#27093)
X-Git-Tag: v3.6.0a2~237
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c35f491a06bb55cba097ddcd9fcbc9452ec21fb1;p=thirdparty%2FPython%2Fcpython.git

merge 3.5 (#27093)
---

c35f491a06bb55cba097ddcd9fcbc9452ec21fb1