From: Brett Cannon <brett@python.org>
Date: Thu, 30 Jun 2016 18:43:19 +0000 (-0700)
Subject: Merge from 3.5 for issue #26664
X-Git-Tag: v3.6.0a3~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16cd909daad3056cbd8b0dd7889718185c27c11f;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.5 for issue #26664
---

16cd909daad3056cbd8b0dd7889718185c27c11f