From: Donald Stufft <donald@stufft.io>
Date: Sun, 14 Aug 2016 20:10:17 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.6.0a4~10^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=80a3ba90fd46ca3857206f35d6ee68270aab6eba;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

80a3ba90fd46ca3857206f35d6ee68270aab6eba