From: Brett Cannon <brett@python.org>
Date: Sat, 17 Dec 2016 20:39:36 +0000 (-0800)
Subject: Merge
X-Git-Tag: v2.7.14rc1~334
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=652a558e48ac8ab8914b33709e39db1c9ea7e1af;p=thirdparty%2FPython%2Fcpython.git

Merge
---

652a558e48ac8ab8914b33709e39db1c9ea7e1af