From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 21 Sep 2015 03:05:41 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~318
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=192c103b5e2641eafb6f6ee07d0961b0b9e0c6eb;p=python

Merge with 3.4
---

192c103b5e2641eafb6f6ee07d0961b0b9e0c6eb