From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 3 Sep 2015 02:08:03 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.6.0a1~1694^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=379583e762c6ac8b4f2e86220ce0bfa8d54c6919;p=python

Merge with 3.4
---

379583e762c6ac8b4f2e86220ce0bfa8d54c6919