From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 10 Jan 2016 07:56:31 +0000 (-0800)
Subject: merge 3.4 (#26066)
X-Git-Tag: v3.6.0a1~804^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d927420b81aac3710b17aca1ff08f3cb281076e;p=python

merge 3.4 (#26066)
---

4d927420b81aac3710b17aca1ff08f3cb281076e