From: Brett Cannon <brett@python.org>
Date: Sun, 27 Dec 2015 20:24:36 +0000 (-0800)
Subject: Merge for issue #12484
X-Git-Tag: v3.6.0a1~857
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4a4ca7c13f65d54087bf6add854bbbc23db1541f;p=thirdparty%2FPython%2Fcpython.git

Merge for issue #12484
---

4a4ca7c13f65d54087bf6add854bbbc23db1541f