From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 14 Jun 2016 06:41:40 +0000 (-0700)
Subject: merge 3.4
X-Git-Tag: v3.6.0a3~160^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=11a693d3304eb896de35733848b5bd9f2b5b4ab5;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

11a693d3304eb896de35733848b5bd9f2b5b4ab5