From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 14 Aug 2016 01:37:12 +0000 (-0700)
Subject: merge 3.4 (closes #27760)
X-Git-Tag: v3.6.0a4~15^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=91060f26f960ceb2ba9da5f86585836e7c2a8b2d;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (closes #27760)
---

91060f26f960ceb2ba9da5f86585836e7c2a8b2d