From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 24 Sep 2015 21:32:38 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~278
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=986f53181a0763df6ac21b144ca35cffb04cc199;p=python

Merge with 3.4
---

986f53181a0763df6ac21b144ca35cffb04cc199