From: Brett Cannon <brett@python.org>
Date: Fri, 15 Jul 2016 17:59:11 +0000 (-0700)
Subject: Merge for #26844
X-Git-Tag: v3.6.0a4~172
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=896e87a99c8b889315a0d72e864360ec575c6b5e;p=thirdparty%2FPython%2Fcpython.git

Merge for #26844
---

896e87a99c8b889315a0d72e864360ec575c6b5e