From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 5 Dec 2015 08:24:10 +0000 (-0800)
Subject: merge 3.5
X-Git-Tag: v3.6.0a1~951
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=608916af240a92d4cd4fe9793e7449cc1f96c9cd;p=python

merge 3.5
---

608916af240a92d4cd4fe9793e7449cc1f96c9cd