From: Jason R. Coombs <jaraco@jaraco.com>
Date: Sun, 31 Aug 2014 22:02:18 +0000 (-0400)
Subject: Merge with 3.4; Closes #22315
X-Git-Tag: v3.5.0a1~986
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=71a8eed6150a83ba0ed652401277e6d17773955c;p=python

Merge with 3.4; Closes #22315
---

71a8eed6150a83ba0ed652401277e6d17773955c