From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 5 Dec 2015 08:27:33 +0000 (-0800)
Subject: merge 3.4
X-Git-Tag: v3.6.0a1~950^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8fc7d296a2735202720f935770fea772c3a0ba3e;p=python

merge 3.4
---

8fc7d296a2735202720f935770fea772c3a0ba3e