From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 20 Jul 2015 21:45:22 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0b4~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fd580cbd170a7c33568151af8fbbc4649ab136f1;p=python

Merge with 3.4
---

fd580cbd170a7c33568151af8fbbc4649ab136f1