From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 14 Aug 2015 20:59:58 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.6.0a1~1789^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a0bcfaff9af66f164e93bae129d9c9be84b3f3d9;p=python

Merge with 3.4
---

a0bcfaff9af66f164e93bae129d9c9be84b3f3d9