From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 18 Apr 2014 21:00:50 +0000 (-0400)
Subject: Merge with 3.4. Closes #21232.
X-Git-Tag: v3.5.0a1~1820
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=386b2b18f56a44499cec67312a55fd343d6069c1;p=python

Merge with 3.4. Closes #21232.
---

386b2b18f56a44499cec67312a55fd343d6069c1