From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 16 Oct 2014 02:01:58 +0000 (-0400)
Subject: Merge with 3.4 Issue#16233
X-Git-Tag: v3.5.0a1~648
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6b541de73d5d5c614322aba8148938108f17c47d;p=python

Merge with 3.4 Issue#16233
---

6b541de73d5d5c614322aba8148938108f17c47d