From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sun, 20 Sep 2015 06:34:20 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~323
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=86eb7300af07c2981ca8728ca1a36b518d47b3ac;p=python

Merge with 3.4
---

86eb7300af07c2981ca8728ca1a36b518d47b3ac