From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 18 Dec 2015 20:47:13 +0000 (-0500)
Subject: Merge with 3.4
X-Git-Tag: v3.6.0a1~885^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=efd7b34d7c4e401bbecb343da7c9506137a3b2fe;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

efd7b34d7c4e401bbecb343da7c9506137a3b2fe