From: Brett Cannon <brett@python.org>
Date: Sat, 25 Jun 2016 17:50:24 +0000 (-0700)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a3~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da037616b10fc12a213e67711065f8123fb98cef;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.5
---

da037616b10fc12a213e67711065f8123fb98cef