From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 14 Oct 2015 02:09:19 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~160
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c1e98de7be2f6d1d34df36b37e45f97ed209c847;p=python

Merge with 3.4
---

c1e98de7be2f6d1d34df36b37e45f97ed209c847