From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 9 Sep 2015 06:10:35 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~414
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=52ee2471b3e0a62db47e36f7f8fe7a2c24ac1ff9;p=python

Merge with 3.4
---

52ee2471b3e0a62db47e36f7f8fe7a2c24ac1ff9