From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 26 Aug 2017 20:42:29 +0000 (-0700)
Subject: Merge branch 'release-2.7.14' into 2.7
X-Git-Tag: v2.7.15rc1~238
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5bd236884083396758959994d619c233e64847bb;p=python

Merge branch 'release-2.7.14' into 2.7
---

5bd236884083396758959994d619c233e64847bb