From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 16 Sep 2017 18:30:58 +0000 (-0700)
Subject: merge 2.7.14 release branch
X-Git-Tag: v2.7.15rc1~197
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=553798722046defeef0584738b1e3b536929ee73;p=python

merge 2.7.14 release branch
---

553798722046defeef0584738b1e3b536929ee73