From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Sat, 3 Sep 2016 15:55:35 +0000 (+0100)
Subject: Merge upstream change.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=44ac3c5fe9b454b7316465162df8b651f23b9f75;p=python

Merge upstream change.
---

44ac3c5fe9b454b7316465162df8b651f23b9f75