From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Thu, 25 Aug 2016 14:14:07 +0000 (+0100)
Subject: Closes #23746: merged update from 3.5.
X-Git-Tag: v3.6.0b1~548
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb1085915298a588d495561e5bc22b81552ecb7e;p=python

Closes #23746: merged update from 3.5.
---

bb1085915298a588d495561e5bc22b81552ecb7e