From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 6 Sep 2017 01:06:20 +0000 (-0700)
Subject: Merge branch 'release-2.7.14' into 2.7
X-Git-Tag: v2.7.15rc1~220
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eba0bad310e0ac650f47a8d0b8b356e84718a132;p=python

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

eba0bad310e0ac650f47a8d0b8b356e84718a132